Skip to content

Commit 575c904

Browse files
lunaticaresloorush
lunaticare
authored and
sloorush
committed
Run pre-commit hooks (haskell#3059)
1 parent 1442482 commit 575c904

File tree

47 files changed

+403
-352
lines changed

Some content is hidden

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

47 files changed

+403
-352
lines changed

‎exe/Main.hs

+11-5
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,26 @@ module Main(main) where
77

88
import Control.Monad.IO.Class (liftIO)
99
import Data.Function ((&))
10-
import Data.Text (Text)
11-
import qualified Development.IDE.Types.Logger as Logger
12-
import Development.IDE.Types.Logger (Priority (Debug, Info, Error),
10+
import Data.Text (Text)
11+
import Development.IDE.Types.Logger (Doc,
12+
Priority (Debug, Error, Info),
1313
WithPriority (WithPriority, priority),
1414
cfilter, cmapWithPrio,
15+
defaultLayoutOptions,
16+
layoutPretty,
1517
makeDefaultStderrRecorder,
16-
withDefaultRecorder, renderStrict, layoutPretty, defaultLayoutOptions, Doc)
18+
renderStrict,
19+
withDefaultRecorder)
20+
import qualified Development.IDE.Types.Logger as Logger
1721
import Ide.Arguments (Arguments (..),
1822
GhcideArguments (..),
1923
getArguments)
2024
import Ide.Main (defaultMain)
2125
import qualified Ide.Main as IdeMain
2226
import Ide.PluginUtils (pluginDescToIdePlugins)
23-
import Ide.Types (PluginDescriptor (pluginNotificationHandlers), defaultPluginDescriptor, mkPluginNotificationHandler)
27+
import Ide.Types (PluginDescriptor (pluginNotificationHandlers),
28+
defaultPluginDescriptor,
29+
mkPluginNotificationHandler)
2430
import Language.LSP.Server as LSP
2531
import Language.LSP.Types as LSP
2632
import qualified Plugins

‎exe/Wrapper.hs

+32-25
Original file line numberDiff line numberDiff line change
@@ -12,50 +12,57 @@
1212
module Main where
1313

1414
import Control.Monad.Extra
15-
import Data.Char (isSpace)
15+
import Data.Char (isSpace)
1616
import Data.Default
1717
import Data.Foldable
1818
import Data.List
1919
import Data.Void
20-
import qualified Development.IDE.Session as Session
21-
import qualified HIE.Bios.Environment as HieBios
20+
import qualified Development.IDE.Session as Session
21+
import qualified HIE.Bios.Environment as HieBios
2222
import HIE.Bios.Types
2323
import Ide.Arguments
2424
import Ide.Version
2525
import System.Directory
2626
import System.Environment
2727
import System.Exit
2828
import System.FilePath
29-
import System.IO
3029
import System.Info
30+
import System.IO
3131
#ifndef mingw32_HOST_OS
32-
import System.Posix.Process (executeFile)
33-
import qualified Data.Map.Strict as Map
32+
import qualified Data.Map.Strict as Map
33+
import System.Posix.Process (executeFile)
3434
#else
3535
import System.Process
3636
#endif
37-
import qualified Data.Text.IO as T
38-
import Control.Monad.Trans.Except (ExceptT, runExceptT, throwE)
39-
import qualified Data.Text as T
40-
import Language.LSP.Server (LspM)
41-
import Control.Monad.IO.Class (MonadIO (liftIO))
42-
import Control.Monad.IO.Unlift (MonadUnliftIO)
43-
import qualified Language.LSP.Server as LSP
44-
import qualified Development.IDE.Main as Main
45-
import Ide.Plugin.Config (Config)
46-
import Language.LSP.Types (RequestMessage, ResponseError, MessageActionItem (MessageActionItem), Method(Initialize), MessageType (MtError), SMethod (SWindowShowMessageRequest, SExit), ShowMessageRequestParams (ShowMessageRequestParams))
47-
import Development.IDE.Types.Logger ( makeDefaultStderrRecorder,
48-
cmapWithPrio,
49-
Pretty(pretty),
50-
Logger(Logger),
51-
Priority(Error, Debug, Info, Warning),
52-
Recorder(logger_),
53-
WithPriority(WithPriority) )
37+
import Control.Concurrent (tryPutMVar)
38+
import Control.Monad.IO.Class (MonadIO (liftIO))
39+
import Control.Monad.IO.Unlift (MonadUnliftIO)
40+
import Control.Monad.Trans.Except (ExceptT, runExceptT,
41+
throwE)
5442
import Data.Maybe
55-
import GHC.Stack.Types (emptyCallStack)
56-
import Control.Concurrent (tryPutMVar)
43+
import qualified Data.Text as T
44+
import qualified Data.Text.IO as T
5745
import Development.IDE.LSP.LanguageServer (runLanguageServer)
46+
import qualified Development.IDE.Main as Main
47+
import Development.IDE.Types.Logger (Logger (Logger),
48+
Pretty (pretty),
49+
Priority (Debug, Error, Info, Warning),
50+
Recorder (logger_),
51+
WithPriority (WithPriority),
52+
cmapWithPrio,
53+
makeDefaultStderrRecorder)
54+
import GHC.Stack.Types (emptyCallStack)
5855
import HIE.Bios.Internal.Log
56+
import Ide.Plugin.Config (Config)
57+
import Language.LSP.Server (LspM)
58+
import qualified Language.LSP.Server as LSP
59+
import Language.LSP.Types (MessageActionItem (MessageActionItem),
60+
MessageType (MtError),
61+
Method (Initialize),
62+
RequestMessage,
63+
ResponseError,
64+
SMethod (SExit, SWindowShowMessageRequest),
65+
ShowMessageRequestParams (ShowMessageRequestParams))
5966

6067
-- ---------------------------------------------------------------------
6168

‎ghcide/bench/lib/Experiments.hs

+14-15
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@ import Development.IDE.Test (getBuildEdgesCount,
3737
getBuildKeysBuilt,
3838
getBuildKeysChanged,
3939
getBuildKeysVisited,
40-
getStoredKeys,
4140
getRebuildsCount,
42-
)
41+
getStoredKeys)
4342
import Development.IDE.Test.Diagnostic
4443
import Development.Shake (CmdOption (Cwd, FileStdout),
4544
cmd_)
@@ -428,20 +427,20 @@ runBenchmarksFun dir allBenchmarks = do
428427
}
429428

430429
data BenchRun = BenchRun
431-
{ startup :: !Seconds,
432-
runSetup :: !Seconds,
433-
runExperiment :: !Seconds,
434-
userWaits :: !Seconds,
435-
delayedWork :: !Seconds,
436-
firstResponse :: !Seconds,
430+
{ startup :: !Seconds,
431+
runSetup :: !Seconds,
432+
runExperiment :: !Seconds,
433+
userWaits :: !Seconds,
434+
delayedWork :: !Seconds,
435+
firstResponse :: !Seconds,
437436
firstResponseDelayed :: !Seconds,
438-
rulesBuilt :: !Int,
439-
rulesChanged :: !Int,
440-
rulesVisited :: !Int,
441-
rulesTotal :: !Int,
442-
edgesTotal :: !Int,
443-
rebuildsTotal :: !Int,
444-
success :: !Bool
437+
rulesBuilt :: !Int,
438+
rulesChanged :: !Int,
439+
rulesVisited :: !Int,
440+
rulesTotal :: !Int,
441+
edgesTotal :: !Int,
442+
rebuildsTotal :: !Int,
443+
success :: !Bool
445444
}
446445

447446
badRun :: BenchRun

‎ghcide/exe/Main.hs

+42-36
Original file line numberDiff line numberDiff line change
@@ -5,44 +5,50 @@
55

66
module Main(main) where
77

8-
import Arguments (Arguments (..),
9-
getArguments)
10-
import Control.Monad.Extra (unless)
11-
import Control.Monad.IO.Class (liftIO)
12-
import Data.Default (def)
13-
import Data.Function ((&))
14-
import Data.Version (showVersion)
15-
import Development.GitRev (gitHash)
16-
import Development.IDE (action)
17-
import Development.IDE.Core.OfInterest (kick)
18-
import Development.IDE.Core.Rules (mainRule)
19-
import qualified Development.IDE.Core.Rules as Rules
20-
import Development.IDE.Core.Tracing (withTelemetryLogger)
21-
import qualified Development.IDE.Main as IDEMain
8+
import Arguments (Arguments (..),
9+
getArguments)
10+
import Control.Monad.Extra (unless)
11+
import Control.Monad.IO.Class (liftIO)
12+
import Data.Default (def)
13+
import Data.Function ((&))
14+
import Data.Version (showVersion)
15+
import Development.GitRev (gitHash)
16+
import Development.IDE (action)
17+
import Development.IDE.Core.OfInterest (kick)
18+
import Development.IDE.Core.Rules (mainRule)
19+
import qualified Development.IDE.Core.Rules as Rules
20+
import Development.IDE.Core.Tracing (withTelemetryLogger)
21+
import qualified Development.IDE.Main as IDEMain
22+
import qualified Development.IDE.Monitoring.EKG as EKG
2223
import qualified Development.IDE.Monitoring.OpenTelemetry as OpenTelemetry
23-
import qualified Development.IDE.Monitoring.EKG as EKG
24-
import qualified Development.IDE.Plugin.HLS.GhcIde as GhcIde
25-
import Development.IDE.Types.Logger (Logger (Logger),
26-
LoggingColumn (DataColumn, PriorityColumn),
27-
Pretty (pretty),
28-
Priority (Debug, Info, Error),
29-
WithPriority (WithPriority, priority),
30-
cfilter, cmapWithPrio,
31-
makeDefaultStderrRecorder, layoutPretty, renderStrict, defaultLayoutOptions)
32-
import qualified Development.IDE.Types.Logger as Logger
24+
import qualified Development.IDE.Plugin.HLS.GhcIde as GhcIde
25+
import Development.IDE.Types.Logger (Logger (Logger),
26+
LoggingColumn (DataColumn, PriorityColumn),
27+
Pretty (pretty),
28+
Priority (Debug, Error, Info),
29+
WithPriority (WithPriority, priority),
30+
cfilter,
31+
cmapWithPrio,
32+
defaultLayoutOptions,
33+
layoutPretty,
34+
makeDefaultStderrRecorder,
35+
renderStrict)
36+
import qualified Development.IDE.Types.Logger as Logger
3337
import Development.IDE.Types.Options
34-
import GHC.Stack (emptyCallStack)
35-
import Language.LSP.Server as LSP
36-
import Language.LSP.Types as LSP
37-
import Ide.Plugin.Config (Config (checkParents, checkProject))
38-
import Ide.PluginUtils (pluginDescToIdePlugins)
39-
import Ide.Types (PluginDescriptor (pluginNotificationHandlers), defaultPluginDescriptor, mkPluginNotificationHandler)
40-
import Paths_ghcide (version)
41-
import qualified System.Directory.Extra as IO
42-
import System.Environment (getExecutablePath)
43-
import System.Exit (exitSuccess)
44-
import System.IO (hPutStrLn, stderr)
45-
import System.Info (compilerVersion)
38+
import GHC.Stack (emptyCallStack)
39+
import Ide.Plugin.Config (Config (checkParents, checkProject))
40+
import Ide.PluginUtils (pluginDescToIdePlugins)
41+
import Ide.Types (PluginDescriptor (pluginNotificationHandlers),
42+
defaultPluginDescriptor,
43+
mkPluginNotificationHandler)
44+
import Language.LSP.Server as LSP
45+
import Language.LSP.Types as LSP
46+
import Paths_ghcide (version)
47+
import qualified System.Directory.Extra as IO
48+
import System.Environment (getExecutablePath)
49+
import System.Exit (exitSuccess)
50+
import System.Info (compilerVersion)
51+
import System.IO (hPutStrLn, stderr)
4652

4753
data Log
4854
= LogIDEMain IDEMain.Log

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ import qualified Data.ByteString.Char8 as B
3636
import Data.Default
3737
import Data.Either.Extra
3838
import Data.Function
39-
import qualified Data.HashMap.Strict as HM
4039
import Data.Hashable
40+
import qualified Data.HashMap.Strict as HM
4141
import Data.IORef
4242
import Data.List
4343
import qualified Data.Map.Strict as Map
@@ -87,6 +87,7 @@ import Data.Void
8787
import Control.Concurrent.STM.Stats (atomically, modifyTVar',
8888
readTVar, writeTVar)
8989
import Control.Concurrent.STM.TQueue
90+
import Control.Monad.IO.Unlift (MonadUnliftIO)
9091
import Data.Foldable (for_)
9192
import Data.HashMap.Strict (HashMap)
9293
import Data.HashSet (HashSet)
@@ -97,9 +98,8 @@ import Development.IDE.Types.Shake (WithHieDb)
9798
import HieDb.Create
9899
import HieDb.Types
99100
import HieDb.Utils
100-
import System.Random (RandomGen)
101101
import qualified System.Random as Random
102-
import Control.Monad.IO.Unlift (MonadUnliftIO)
102+
import System.Random (RandomGen)
103103

104104
data Log
105105
= LogSettingInitialDynFlags

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
-- See https://github.com/haskell/ghcide/pull/697
66
module Development.IDE.Session.VersionCheck (ghcVersionChecker) where
77

8-
import GHC.Check
8+
import GHC.Check
99
-- Only use this for checking against the compile time GHC libDir!
1010
-- Use getRuntimeGhcLibDir from hie-bios instead for everything else
1111
-- otherwise binaries will not be distributable since paths will be baked into them

‎ghcide/src/Development/IDE.hs

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@ import Development.IDE.Core.FileStore as X (getFileContents)
1616
import Development.IDE.Core.IdeConfiguration as X (IdeConfiguration (..),
1717
isWorkspaceFile)
1818
import Development.IDE.Core.OfInterest as X (getFilesOfInterestUntracked)
19-
import Development.IDE.Core.RuleTypes as X
2019
import Development.IDE.Core.Rules as X (getClientConfigAction,
2120
getParsedModule)
21+
import Development.IDE.Core.RuleTypes as X
2222
import Development.IDE.Core.Service as X (runAction)
2323
import Development.IDE.Core.Shake as X (FastResult (..),
2424
IdeAction (..),
2525
IdeRule, IdeState,
2626
RuleBody (..),
2727
ShakeExtras,
28+
VFSModified (..),
2829
actionLogger,
2930
define,
3031
defineEarlyCutoff,
@@ -40,8 +41,7 @@ import Development.IDE.Core.Shake as X (FastResult (..),
4041
useWithStaleFast,
4142
useWithStaleFast',
4243
useWithStale_,
43-
use_, uses, uses_,
44-
VFSModified(..))
44+
use_, uses, uses_)
4545
import Development.IDE.GHC.Compat as X (GhcVersion (..),
4646
ghcVersion)
4747
import Development.IDE.GHC.Error as X

0 commit comments

Comments
 (0)