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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 4 additions & 4 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 4 additions & 4 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 13 additions & 7 deletions
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

0 commit comments

Comments
 (0)