Skip to content

Commit e0a4642

Browse files
AilrunAilrun
authored
Apply formats again (#1824)
* Apply formattings * Update nix exclude range
1 parent 04e08d7 commit e0a4642

File tree

48 files changed

+281
-252
lines changed

Some content is hidden

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

48 files changed

+281
-252
lines changed

‎ghcide/exe/Main.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ import Development.IDE (Logger (Logger),
2222
Priority (Info), action)
2323
import Development.IDE.Core.OfInterest (kick)
2424
import Development.IDE.Core.Rules (mainRule)
25+
import Development.IDE.Graph (ShakeOptions (shakeThreads))
2526
import qualified Development.IDE.Main as Main
2627
import qualified Development.IDE.Plugin.HLS.GhcIde as GhcIde
2728
import qualified Development.IDE.Plugin.Test as Test
2829
import Development.IDE.Types.Options
29-
import Development.IDE.Graph (ShakeOptions (shakeThreads))
3030
import Ide.Plugin.Config (Config (checkParents, checkProject))
3131
import Ide.Plugin.ConfigUtils (pluginsToDefaultConfig,
3232
pluginsToVSCodeExtensionSchema)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ loadWithImplicitCradle :: Maybe FilePath
143143
loadWithImplicitCradle mHieYaml rootDir = do
144144
crdl <- case mHieYaml of
145145
Just yaml -> HieBios.loadCradle yaml
146-
Nothing -> loadImplicitHieCradle $ addTrailingPathSeparator rootDir
146+
Nothing -> loadImplicitHieCradle $ addTrailingPathSeparator rootDir
147147
return crdl
148148

149149
getInitialGhcLibDirDefault :: IO (Maybe LibDir)

‎ghcide/src/Control/Concurrent/Strict.hs

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ module Control.Concurrent.Strict
44
,module Control.Concurrent.Extra
55
) where
66

7-
import Control.Concurrent.Extra hiding (modifyVar, modifyVar_)
7+
import Control.Concurrent.Extra hiding (modifyVar, modifyVar_)
88
import qualified Control.Concurrent.Extra as Extra
9-
import Control.Exception (evaluate)
10-
import Data.Tuple.Extra (dupe)
11-
import Control.Monad (void)
9+
import Control.Exception (evaluate)
10+
import Control.Monad (void)
11+
import Data.Tuple.Extra (dupe)
1212

1313
-- | Strict modification that returns the new value
1414
modifyVar' :: Var a -> (a -> a) -> IO a

‎ghcide/src/Development/IDE.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ import Development.IDE.Core.Shake as X (FastResult (..),
4444
use_, uses, uses_)
4545
import Development.IDE.GHC.Error as X
4646
import Development.IDE.GHC.Util as X
47+
import Development.IDE.Graph as X (Action, RuleResult,
48+
Rules, action)
4749
import Development.IDE.Plugin as X
4850
import Development.IDE.Types.Diagnostics as X
4951
import Development.IDE.Types.HscEnvEq as X (HscEnvEq (..),
5052
hscEnv,
5153
hscEnvWithImportPaths)
5254
import Development.IDE.Types.Location as X
5355
import Development.IDE.Types.Logger as X
54-
import Development.IDE.Graph as X (Action, RuleResult,
55-
Rules, action)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ import Development.IDE.GHC.Compat hiding (TargetFile,
2828
parseModule,
2929
typecheckModule,
3030
writeHieFile)
31+
import Development.IDE.Graph
3132
import qualified Development.IDE.Spans.AtPoint as AtPoint
3233
import Development.IDE.Types.Location
33-
import Development.IDE.Graph
3434
import qualified HieDb
3535
import Language.LSP.Types (DocumentHighlight (..),
3636
SymbolInformation (..))

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ module Development.IDE.Core.Debouncer
1111
import Control.Concurrent.Async
1212
import Control.Concurrent.Strict
1313
import Control.Exception
14-
import Control.Monad (join)
15-
import Data.Foldable (traverse_)
16-
import Data.HashMap.Strict (HashMap)
17-
import qualified Data.HashMap.Strict as Map
14+
import Control.Monad (join)
15+
import Data.Foldable (traverse_)
16+
import Data.HashMap.Strict (HashMap)
17+
import qualified Data.HashMap.Strict as Map
1818
import Data.Hashable
1919
import System.Time.Extra
2020

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import Development.IDE.Core.FileStore
2222
import Development.IDE.Core.IdeConfiguration
2323
import Development.IDE.Core.RuleTypes
2424
import Development.IDE.Core.Shake
25+
import Development.IDE.Graph
2526
import Development.IDE.Types.Location
2627
import Development.IDE.Types.Options
27-
import Development.IDE.Graph
2828
import Language.LSP.Server hiding (getVirtualFile)
2929
import Language.LSP.Types
3030
import Language.LSP.Types.Capabilities

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ import System.IO.Error
5555
#ifdef mingw32_HOST_OS
5656
import qualified System.Directory as Dir
5757
#else
58-
import System.Posix.Files ( getFileStatus, modificationTimeHiRes)
58+
import System.Posix.Files (getFileStatus,
59+
modificationTimeHiRes)
5960
#endif
6061

6162
import qualified Development.IDE.Types.Logger as L

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import Data.HashSet (HashSet, singleton)
2020
import Data.Hashable (Hashed, hashed, unhashed)
2121
import Data.Text (Text, isPrefixOf)
2222
import Development.IDE.Core.Shake
23-
import Development.IDE.Types.Location
2423
import Development.IDE.Graph
24+
import Development.IDE.Types.Location
2525
import Language.LSP.Types
2626
import System.FilePath (isRelative)
2727

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

+13-7
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,10 @@ import Development.IDE.GHC.Compat hiding
111111
writeHieFile)
112112
import Development.IDE.GHC.Error
113113
import Development.IDE.GHC.ExactPrint
114-
import Development.IDE.GHC.Util hiding (modifyDynFlags)
114+
import Development.IDE.GHC.Util hiding
115+
(modifyDynFlags)
116+
import Development.IDE.Graph
117+
import Development.IDE.Graph.Classes hiding (get, put)
115118
import Development.IDE.Import.DependencyInformation
116119
import Development.IDE.Import.FindImports
117120
import qualified Development.IDE.Spans.AtPoint as AtPoint
@@ -122,8 +125,6 @@ import Development.IDE.Types.HscEnvEq
122125
import Development.IDE.Types.Location
123126
import qualified Development.IDE.Types.Logger as L
124127
import Development.IDE.Types.Options
125-
import Development.IDE.Graph
126-
import Development.IDE.Graph.Classes hiding (get, put)
127128
import Fingerprint
128129
import GHC.Generics (Generic)
129130
import GHC.IO.Encoding
@@ -140,11 +141,16 @@ import Module
140141
import System.Directory (canonicalizePath)
141142
import TcRnMonad (tcg_dependent_files)
142143

143-
import Ide.Plugin.Properties (HasProperty, KeyNameProxy, Properties, ToHsType, useProperty)
144-
import Ide.Types (PluginId, DynFlagsModifications(dynFlagsModifyGlobal, dynFlagsModifyParser))
145-
import Data.Default (def)
146-
import Ide.PluginUtils (configForPlugin)
147144
import Control.Applicative
145+
import Data.Default (def)
146+
import Ide.Plugin.Properties (HasProperty,
147+
KeyNameProxy,
148+
Properties,
149+
ToHsType,
150+
useProperty)
151+
import Ide.PluginUtils (configForPlugin)
152+
import Ide.Types (DynFlagsModifications (dynFlagsModifyGlobal, dynFlagsModifyParser),
153+
PluginId)
148154

149155
-- | This is useful for rules to convert rules that can only produce errors or
150156
-- a result into the more general IdeResult type that supports producing

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ import Control.Exception.Extra hiding (bracket_)
148148
import Data.Default
149149
import HieDb.Types
150150
import Ide.Plugin.Config
151-
import qualified Ide.PluginUtils as HLS
152-
import Ide.Types (PluginId)
151+
import qualified Ide.PluginUtils as HLS
152+
import Ide.Types (PluginId)
153153

154154
-- | We need to serialize writes to the database, so we send any function that
155155
-- needs to write to the database over the channel, where it will be picked up by

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
{-# LANGUAGE CPP #-}
12
{-# LANGUAGE NoApplicativeDo #-}
2-
{-# LANGUAGE CPP #-}
33
module Development.IDE.Core.Tracing
44
( otTracedHandler
55
, otTracedAction
@@ -32,12 +32,12 @@ import Debug.Trace.Flags (userTracingEnabled)
3232
import Development.IDE.Core.RuleTypes (GhcSession (GhcSession),
3333
GhcSessionDeps (GhcSessionDeps),
3434
GhcSessionIO (GhcSessionIO))
35+
import Development.IDE.Graph (Action, actionBracket)
3536
import Development.IDE.Types.Location (Uri (..))
3637
import Development.IDE.Types.Logger (Logger, logDebug, logInfo)
3738
import Development.IDE.Types.Shake (Key (..), Value,
3839
ValueWithDiagnostics (..),
3940
Values)
40-
import Development.IDE.Graph (Action, actionBracket)
4141
import Foreign.Storable (Storable (sizeOf))
4242
import HeapSize (recursiveSize, runHeapsize)
4343
import Ide.PluginUtils (installSigUsr1Handler)

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

+15-11
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,23 @@ module Development.IDE.Core.UseStale
2020
) where
2121

2222
import Control.Arrow
23-
import Control.Category (Category)
24-
import qualified Control.Category as C
25-
import Control.DeepSeq (NFData)
23+
import Control.Category (Category)
24+
import qualified Control.Category as C
25+
import Control.DeepSeq (NFData)
2626
import Data.Aeson
27-
import Data.Coerce (coerce)
28-
import Data.Functor ((<&>))
29-
import Data.Functor.Identity (Identity(Identity))
30-
import Data.Kind (Type)
31-
import Data.String (fromString)
32-
import Development.IDE (NormalizedFilePath, IdeRule, Action, Range, rangeToRealSrcSpan, realSrcSpanToRange)
27+
import Data.Coerce (coerce)
28+
import Data.Functor ((<&>))
29+
import Data.Functor.Identity (Identity (Identity))
30+
import Data.Kind (Type)
31+
import Data.String (fromString)
32+
import Development.IDE (Action, IdeRule,
33+
NormalizedFilePath,
34+
Range,
35+
rangeToRealSrcSpan,
36+
realSrcSpanToRange)
3337
import qualified Development.IDE.Core.PositionMapping as P
34-
import qualified Development.IDE.Core.Shake as IDE
35-
import qualified FastString as FS
38+
import qualified Development.IDE.Core.Shake as IDE
39+
import qualified FastString as FS
3640
import SrcLoc
3741

3842

‎ghcide/src/Development/IDE/GHC/Compat.hs

+34-38
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
-- Copyright (c) 2019 The DAML Authors. All rights reserved.
22
-- SPDX-License-Identifier: Apache-2.0
33

4-
{-# LANGUAGE CPP #-}
5-
{-# LANGUAGE ConstraintKinds #-}
4+
{-# LANGUAGE CPP #-}
5+
{-# LANGUAGE ConstraintKinds #-}
66
{-# LANGUAGE FlexibleInstances #-}
7-
{-# LANGUAGE PatternSynonyms #-}
7+
{-# LANGUAGE PatternSynonyms #-}
88
{-# OPTIONS -Wno-dodgy-imports -Wno-incomplete-uni-patterns #-}
99

1010
-- | Attempt at hiding the GHC version differences we can.
@@ -62,60 +62,56 @@ module Development.IDE.GHC.Compat(
6262
,isQualifiedImport) where
6363

6464
#if MIN_VERSION_ghc(8,10,0)
65-
import LinkerTypes
65+
import LinkerTypes
6666
#endif
6767

68-
import StringBuffer
68+
import Compat.HieAst (enrichHie, mkHieFile)
69+
import Compat.HieBin
70+
import Compat.HieTypes
71+
import Compat.HieUtils
72+
import qualified Data.ByteString as BS
73+
import Data.IORef
74+
import DynFlags hiding (ExposePackage)
6975
import qualified DynFlags
70-
import DynFlags hiding (ExposePackage)
71-
import Fingerprint (Fingerprint)
76+
import Fingerprint (Fingerprint)
77+
import HscTypes
78+
import MkIface
7279
import qualified Module
73-
import Packages
74-
import Data.IORef
75-
import HscTypes
76-
import NameCache
77-
import qualified Data.ByteString as BS
78-
import MkIface
79-
import TcRnTypes
80-
import Compat.HieAst (mkHieFile,enrichHie)
81-
import Compat.HieBin
82-
import Compat.HieTypes
83-
import Compat.HieUtils
80+
import NameCache
81+
import Packages
82+
import StringBuffer
83+
import TcRnTypes
8484

8585
#if MIN_VERSION_ghc(8,10,0)
86-
import GHC.Hs.Extension
86+
import GHC.Hs.Extension
8787
#else
88-
import HsExtension
88+
import HsExtension
8989
#endif
9090

91+
import Avail
92+
import GHC hiding (HasSrcSpan, ModLocation, getLoc,
93+
lookupName)
9194
import qualified GHC
9295
import qualified TyCoRep
93-
import GHC hiding (
94-
ModLocation,
95-
HasSrcSpan,
96-
lookupName,
97-
getLoc
98-
)
99-
import Avail
10096
#if MIN_VERSION_ghc(8,8,0)
101-
import Data.List (foldl')
97+
import Data.List (foldl')
10298
#else
103-
import Data.List (foldl', isSuffixOf)
99+
import Data.List (foldl', isSuffixOf)
104100
#endif
105101

106-
import DynamicLoading
107-
import Plugins (Plugin(parsedResultAction), withPlugins)
108-
import Data.Map.Strict (Map)
102+
import Data.Map.Strict (Map)
103+
import DynamicLoading
104+
import Plugins (Plugin (parsedResultAction), withPlugins)
109105

110106
#if !MIN_VERSION_ghc(8,8,0)
111-
import System.FilePath ((-<.>))
107+
import System.FilePath ((-<.>))
112108
#endif
113109

114110
#if !MIN_VERSION_ghc(8,8,0)
115111
import qualified EnumSet
116112

117-
import System.IO
118-
import Foreign.ForeignPtr
113+
import Foreign.ForeignPtr
114+
import System.IO
119115

120116

121117
hPutStringBuffer :: Handle -> StringBuffer -> IO ()
@@ -303,8 +299,8 @@ pattern FunTy arg res <- TyCoRep.FunTy arg res
303299
isQualifiedImport :: ImportDecl a -> Bool
304300
#if MIN_VERSION_ghc(8,10,0)
305301
isQualifiedImport ImportDecl{ideclQualified = NotQualified} = False
306-
isQualifiedImport ImportDecl{} = True
302+
isQualifiedImport ImportDecl{} = True
307303
#else
308-
isQualifiedImport ImportDecl{ideclQualified} = ideclQualified
304+
isQualifiedImport ImportDecl{ideclQualified} = ideclQualified
309305
#endif
310-
isQualifiedImport _ = False
306+
isQualifiedImport _ = False

0 commit comments

Comments
 (0)