Skip to content

Commit b6dc425

Browse files
joyfulmantisjoyfulmantis
authored
Move Recorder to hls-plugin-api (#3714)
1 parent 8c22b84 commit b6dc425

File tree

52 files changed

+238
-196
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+238
-196
lines changed

‎exe/Main.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ import Data.Function ((&))
1313
import Data.Functor ((<&>))
1414
import Data.Maybe (catMaybes)
1515
import Data.Text (Text)
16-
import Development.IDE.Types.Logger (Doc, Priority (Error, Info),
16+
import Ide.Logger (Doc, Priority (Error, Info),
1717
Recorder,
1818
WithPriority (WithPriority, priority),
1919
cfilter, cmapWithPrio,
2020
defaultLayoutOptions,
2121
layoutPretty, logWith,
2222
makeDefaultStderrRecorder,
2323
renderStrict, withFileRecorder)
24-
import qualified Development.IDE.Types.Logger as Logger
24+
import qualified Ide.Logger as Logger
2525
import qualified HlsPlugins as Plugins
2626
import Ide.Arguments (Arguments (..),
2727
GhcideArguments (..),

‎exe/Wrapper.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ import qualified Data.Text as T
4545
import qualified Data.Text.IO as T
4646
import Development.IDE.LSP.LanguageServer (runLanguageServer)
4747
import qualified Development.IDE.Main as Main
48-
import Development.IDE.Types.Logger (Doc, Logger (Logger),
48+
import GHC.Stack.Types (emptyCallStack)
49+
import Ide.Logger (Doc, Logger (Logger),
4950
Pretty (pretty),
5051
Recorder (logger_),
5152
WithPriority (WithPriority),
5253
cmapWithPrio,
5354
makeDefaultStderrRecorder,
5455
toCologActionWithPrio)
55-
import GHC.Stack.Types (emptyCallStack)
5656
import Ide.Plugin.Config (Config)
5757
import Ide.Types (IdePlugins (IdePlugins))
5858
import Language.LSP.Protocol.Message (Method (Method_Initialize),

‎ghcide/exe/Main.hs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ import qualified Development.IDE.Main as IDEMain
2222
import qualified Development.IDE.Monitoring.EKG as EKG
2323
import qualified Development.IDE.Monitoring.OpenTelemetry as OpenTelemetry
2424
import qualified Development.IDE.Plugin.HLS.GhcIde as GhcIde
25-
import Development.IDE.Types.Logger (Logger (Logger),
25+
import Development.IDE.Types.Options
26+
import GHC.Stack (emptyCallStack)
27+
import Ide.Logger (Logger (Logger),
2628
LoggingColumn (DataColumn, PriorityColumn),
2729
Pretty (pretty),
2830
Priority (Debug, Error, Info),
@@ -33,9 +35,7 @@ import Development.IDE.Types.Logger (Logger (Logger),
3335
layoutPretty,
3436
makeDefaultStderrRecorder,
3537
renderStrict)
36-
import qualified Development.IDE.Types.Logger as Logger
37-
import Development.IDE.Types.Options
38-
import GHC.Stack (emptyCallStack)
38+
import qualified Ide.Logger as Logger
3939
import Ide.Plugin.Config (Config (checkParents, checkProject))
4040
import Ide.PluginUtils (pluginDescToIdePlugins)
4141
import Ide.Types (PluginDescriptor (pluginNotificationHandlers),

‎ghcide/ghcide.cabal‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ library
197197
Development.IDE.Types.HscEnvEq
198198
Development.IDE.Types.KnownTargets
199199
Development.IDE.Types.Location
200-
Development.IDE.Types.Logger
201200
Development.IDE.Types.Monitoring
202201
Development.IDE.Monitoring.OpenTelemetry
203202
Development.IDE.Types.Options

‎ghcide/session-loader/Development/IDE/Session.hs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,20 @@ import Development.IDE.Types.Exports
6565
import Development.IDE.Types.HscEnvEq (HscEnvEq, newHscEnvEq,
6666
newHscEnvEqPreserveImportPaths)
6767
import Development.IDE.Types.Location
68-
import Development.IDE.Types.Logger (Pretty (pretty),
69-
Priority (Debug, Error, Info, Warning),
70-
Recorder, WithPriority,
71-
cmapWithPrio, logWith,
72-
nest,
73-
toCologActionWithPrio,
74-
vcat, viaShow, (<+>))
7568
import Development.IDE.Types.Options
7669
import GHC.Check
7770
import qualified HIE.Bios as HieBios
7871
import HIE.Bios.Environment hiding (getCacheDir)
7972
import HIE.Bios.Types hiding (Log)
8073
import qualified HIE.Bios.Types as HieBios
8174
import Hie.Implicit.Cradle (loadImplicitHieCradle)
75+
import Ide.Logger (Pretty (pretty),
76+
Priority (Debug, Error, Info, Warning),
77+
Recorder, WithPriority,
78+
cmapWithPrio, logWith,
79+
nest,
80+
toCologActionWithPrio,
81+
vcat, viaShow, (<+>))
8282
import Language.LSP.Protocol.Message
8383
import Language.LSP.Server
8484
import System.Directory

‎ghcide/src/Development/IDE.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,4 @@ import Development.IDE.Types.HscEnvEq as X (HscEnvEq (..),
5555
hscEnv,
5656
hscEnvWithImportPaths)
5757
import Development.IDE.Types.Location as X
58-
import Development.IDE.Types.Logger as X
58+
import Ide.Logger as X

‎ghcide/src/Development/IDE/Core/FileExists.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ import Development.IDE.Core.Shake hiding (Log)
2727
import qualified Development.IDE.Core.Shake as Shake
2828
import Development.IDE.Graph
2929
import Development.IDE.Types.Location
30-
import Development.IDE.Types.Logger (Pretty (pretty),
31-
Recorder, WithPriority,
32-
cmapWithPrio)
3330
import Development.IDE.Types.Options
3431
import qualified Focus
32+
import Ide.Logger (Pretty (pretty),
33+
Recorder, WithPriority,
34+
cmapWithPrio)
3535
import Ide.Plugin.Config (Config)
3636
import Language.LSP.Protocol.Types
3737
import Language.LSP.Server hiding (getVirtualFile)

‎ghcide/src/Development/IDE/Core/FileStore.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ import qualified System.Directory as Dir
5454
#else
5555
#endif
5656

57-
import qualified Development.IDE.Types.Logger as L
57+
import qualified Ide.Logger as L
5858

5959
import Data.Aeson (ToJSON (toJSON))
6060
import qualified Data.Binary as B
@@ -63,7 +63,7 @@ import Data.List (foldl')
6363
import qualified Data.Text as Text
6464
import Development.IDE.Core.IdeConfiguration (isWorkspaceFile)
6565
import qualified Development.IDE.Core.Shake as Shake
66-
import Development.IDE.Types.Logger (Pretty (pretty),
66+
import Ide.Logger (Pretty (pretty),
6767
Priority (Info),
6868
Recorder,
6969
WithPriority,

‎ghcide/src/Development/IDE/Core/OfInterest.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ import qualified Development.IDE.Core.Shake as Shake
4040
import Development.IDE.Plugin.Completions.Types
4141
import Development.IDE.Types.Exports
4242
import Development.IDE.Types.Location
43-
import Development.IDE.Types.Logger (Pretty (pretty),
43+
import Development.IDE.Types.Options (IdeTesting (..))
44+
import GHC.TypeLits (KnownSymbol)
45+
import Ide.Logger (Pretty (pretty),
4446
Recorder,
4547
WithPriority,
4648
cmapWithPrio,
4749
logDebug)
48-
import Development.IDE.Types.Options (IdeTesting (..))
49-
import GHC.TypeLits (KnownSymbol)
5050
import qualified Language.LSP.Protocol.Message as LSP
5151
import qualified Language.LSP.Server as LSP
5252

‎ghcide/src/Development/IDE/Core/Rules.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ import Control.Concurrent.STM.Stats (atomically)
153153
import Language.LSP.Server (LspT)
154154
import System.Info.Extra (isWindows)
155155
import HIE.Bios.Ghc.Gap (hostIsDynamic)
156-
import Development.IDE.Types.Logger (Recorder, logWith, cmapWithPrio, WithPriority, Pretty (pretty), (<+>), nest, vcat)
156+
import Ide.Logger (Recorder, logWith, cmapWithPrio, WithPriority, Pretty (pretty), (<+>), nest, vcat)
157157
import qualified Development.IDE.Core.Shake as Shake
158-
import qualified Development.IDE.Types.Logger as Logger
158+
import qualified Ide.Logger as Logger
159159
import qualified Development.IDE.Types.Shake as Shake
160160
import Development.IDE.GHC.CoreFile
161161
import Data.Time.Clock.POSIX (posixSecondsToUTCTime)

0 commit comments

Comments
 (0)