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

+2-2
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

+2-2
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

+4-4
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

-1
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

+7-7
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

+1-1
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

+3-3
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

+2-2
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

+3-3
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

+2-2
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)

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ import Development.IDE.Core.Debouncer
2323
import Development.IDE.Core.FileExists (fileExistsRules)
2424
import Development.IDE.Core.OfInterest hiding (Log, LogShake)
2525
import Development.IDE.Graph
26-
import Development.IDE.Types.Logger as Logger (Logger,
26+
import Development.IDE.Types.Options (IdeOptions (..))
27+
import Ide.Logger as Logger (Logger,
2728
Pretty (pretty),
2829
Priority (Debug),
2930
Recorder,
3031
WithPriority,
3132
cmapWithPrio)
32-
import Development.IDE.Types.Options (IdeOptions (..))
3333
import Ide.Plugin.Config
3434
import qualified Language.LSP.Protocol.Types as LSP
3535
import qualified Language.LSP.Server as LSP

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ import Development.IDE.Types.Exports
152152
import qualified Development.IDE.Types.Exports as ExportsMap
153153
import Development.IDE.Types.KnownTargets
154154
import Development.IDE.Types.Location
155-
import Development.IDE.Types.Logger hiding (Priority)
156-
import qualified Development.IDE.Types.Logger as Logger
155+
import Ide.Logger hiding (Priority)
156+
import qualified Ide.Logger as Logger
157157
import Development.IDE.Types.Monitoring (Monitoring (..))
158158
import Development.IDE.Types.Options
159159
import Development.IDE.Types.Shake

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import Development.IDE.Graph.Rule
2929
import Development.IDE.Types.Diagnostics (FileDiagnostic,
3030
showDiagnostics)
3131
import Development.IDE.Types.Location (Uri (..))
32-
import Development.IDE.Types.Logger (Logger (Logger))
32+
import Ide.Logger (Logger (Logger))
3333
import Ide.Types (PluginId (..))
3434
import Language.LSP.Protocol.Types (NormalizedFilePath,
3535
fromNormalizedFilePath)

‎ghcide/src/Development/IDE/LSP/HoverDefinition.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import Development.IDE.Core.Actions
2121
import Development.IDE.Core.Rules
2222
import Development.IDE.Core.Shake
2323
import Development.IDE.Types.Location
24-
import Development.IDE.Types.Logger
24+
import Ide.Logger
2525
import Language.LSP.Protocol.Message
2626
import Language.LSP.Protocol.Types
2727
import qualified Language.LSP.Server as LSP

‎ghcide/src/Development/IDE/LSP/LanguageServer.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ import Development.IDE.Core.IdeConfiguration
4141
import Development.IDE.Core.Shake hiding (Log, Priority)
4242
import Development.IDE.Core.Tracing
4343
import qualified Development.IDE.Session as Session
44-
import Development.IDE.Types.Logger
45-
import qualified Development.IDE.Types.Logger as Logger
4644
import Development.IDE.Types.Shake (WithHieDb)
45+
import Ide.Logger
46+
import qualified Ide.Logger as Logger
4747
import Language.LSP.Server (LanguageContextEnv,
4848
LspServerLog,
4949
type (<~>))

‎ghcide/src/Development/IDE/LSP/Notifications.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ import Development.IDE.Core.Service hiding (Log, LogShake)
3737
import Development.IDE.Core.Shake hiding (Log, Priority)
3838
import qualified Development.IDE.Core.Shake as Shake
3939
import Development.IDE.Types.Location
40-
import Development.IDE.Types.Logger
4140
import Development.IDE.Types.Shake (toKey)
41+
import Ide.Logger
4242
import Ide.Types
4343
import Numeric.Natural
4444

‎ghcide/src/Development/IDE/Main.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ import Development.IDE.Session (SessionLoadingOptions
7777
import qualified Development.IDE.Session as Session
7878
import Development.IDE.Types.Location (NormalizedUri,
7979
toNormalizedFilePath')
80-
import Development.IDE.Types.Logger (Logger,
80+
import Ide.Logger (Logger,
8181
Pretty (pretty),
8282
Priority (Info, Warning),
8383
Recorder,

‎ghcide/src/Development/IDE/Main/HeapStats.hs

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import Control.Concurrent
66
import Control.Concurrent.Async
77
import Control.Monad
88
import Data.Word
9-
import Development.IDE.Types.Logger (Pretty (pretty), Priority (Info),
10-
Recorder, WithPriority, hsep,
11-
logWith, (<+>))
129
import GHC.Stats
13-
import Text.Printf (printf)
10+
import Ide.Logger (Pretty (pretty), Priority (Info),
11+
Recorder, WithPriority, hsep,
12+
logWith, (<+>))
13+
import Text.Printf (printf)
1414

1515
data Log
1616
= LogHeapStatsPeriod !Int

‎ghcide/src/Development/IDE/Monitoring/EKG.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{-# LANGUAGE CPP #-}
22
module Development.IDE.Monitoring.EKG(monitoring) where
33

4-
import Development.IDE.Types.Logger (Logger)
54
import Development.IDE.Types.Monitoring (Monitoring (..))
5+
import Ide.Logger (Logger)
66
#ifdef MONITORING_EKG
77
import Control.Concurrent (killThread)
88
import Control.Concurrent.Async (async, waitCatch)
99
import Control.Monad (forM_)
1010
import Data.Text (pack)
11-
import Development.IDE.Types.Logger (logInfo)
11+
import Ide.Logger (logInfo)
1212
import qualified System.Metrics as Monitoring
1313
import qualified System.Remote.Monitoring.Wai as Monitoring
1414

‎ghcide/src/Development/IDE/Plugin/Completions.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import Development.IDE.Types.HscEnvEq (HscEnvEq (envPackageE
3636
hscEnv)
3737
import qualified Development.IDE.Types.KnownTargets as KT
3838
import Development.IDE.Types.Location
39-
import Development.IDE.Types.Logger (Pretty (pretty),
39+
import Ide.Logger (Pretty (pretty),
4040
Recorder,
4141
WithPriority,
4242
cmapWithPrio)

‎ghcide/src/Development/IDE/Plugin/HLS.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import Development.IDE.Graph (Rules)
3232
import Development.IDE.LSP.Server
3333
import Development.IDE.Plugin
3434
import qualified Development.IDE.Plugin as P
35-
import Development.IDE.Types.Logger hiding (Error)
35+
import Ide.Logger hiding (Error)
3636
import Ide.Plugin.Config
3737
import Ide.PluginUtils (getClientConfig)
3838
import Ide.Types as HLS

‎ghcide/src/Development/IDE/Plugin/TypeLenses.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ import Development.IDE.Graph.Classes
4646
import Development.IDE.Spans.LocalBindings (Bindings, getFuzzyScope)
4747
import Development.IDE.Types.Location (Position (Position, _character, _line),
4848
Range (Range, _end, _start))
49-
import Development.IDE.Types.Logger (Pretty (pretty),
49+
import GHC.Generics (Generic)
50+
import Ide.Logger (Pretty (pretty),
5051
Recorder, WithPriority,
5152
cmapWithPrio)
52-
import GHC.Generics (Generic)
5353
import Ide.Plugin.Properties
5454
import Ide.PluginUtils
5555
import Ide.Types (CommandFunction,

‎ghcide/src/Development/IDE/Types/Action.hs

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ module Development.IDE.Types.Action
1111
where
1212

1313
import Control.Concurrent.STM
14-
import Data.Hashable (Hashable (..))
15-
import Data.HashSet (HashSet)
16-
import qualified Data.HashSet as Set
17-
import Data.Unique (Unique)
18-
import Development.IDE.Graph (Action)
19-
import Development.IDE.Types.Logger
14+
import Data.Hashable (Hashable (..))
15+
import Data.HashSet (HashSet)
16+
import qualified Data.HashSet as Set
17+
import Data.Unique (Unique)
18+
import Development.IDE.Graph (Action)
19+
import Ide.Logger
2020
import Numeric.Natural
2121

2222
data DelayedAction a = DelayedAction

0 commit comments

Comments
 (0)