Skip to content

Commit b378de2

Browse files
andys8pepeiborra
andys8
and
pepeiborra
authored
Solve formatting issues (stylish-haskell, pre-commit CI) (#3171)
* Solve formatting issues * stylish-haskell parse errors solved (partially) * Env: Changing order (import) * Plugins: Dangling `$` Co-authored-by: Pepe Iborra <[email protected]>
1 parent a13e1b3 commit b378de2

File tree

18 files changed

+74
-77
lines changed

18 files changed

+74
-77
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
-- Copyright (c) 2019 The DAML Authors. All rights reserved.
22
-- SPDX-License-Identifier: Apache-2.0
3-
{-# LANGUAGE CPP #-}
3+
{-# LANGUAGE CPP #-}
44

55
module Development.IDE.Core.Preprocessor
66
( preprocessor
@@ -30,8 +30,8 @@ import qualified GHC.LanguageExtensions as LangExt
3030
import System.FilePath
3131
import System.IO.Extra
3232
#if MIN_VERSION_ghc(9,3,0)
33-
import GHC.Utils.Logger (LogFlags(..))
34-
import GHC.Utils.Outputable (renderWithContext)
33+
import GHC.Utils.Logger (LogFlags (..))
34+
import GHC.Utils.Outputable (renderWithContext)
3535
#endif
3636

3737
-- | Given a file and some contents, apply any necessary preprocessors,

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,10 @@ import Development.IDE.GHC.Compat (NameCache,
130130
NameCacheUpdater (..),
131131
initNameCache,
132132
knownKeyNames,
133+
mkSplitUniqSupply)
133134
#if !MIN_VERSION_ghc(9,3,0)
134-
upNameCache,
135+
import Development.IDE.GHC.Compat (upNameCache)
135136
#endif
136-
mkSplitUniqSupply
137-
)
138137
import Development.IDE.GHC.Orphans ()
139138
import Development.IDE.Graph hiding (ShakeValue)
140139
import qualified Development.IDE.Graph as Shake

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import DynFlags
3535
#endif
3636
#endif
3737
#if MIN_VERSION_ghc(9,3,0)
38-
import qualified GHC.Driver.Pipeline.Execute as Pipeline
38+
import qualified GHC.Driver.Pipeline.Execute as Pipeline
3939
#endif
4040

4141
addOptP :: String -> DynFlags -> DynFlags

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,6 @@ import HscTypes as Env
9191
import Module
9292
#endif
9393

94-
#if MIN_VERSION_ghc(9,3,0)
95-
hsc_EPS :: HscEnv -> UnitEnv
96-
hsc_EPS = hsc_unit_env
97-
#endif
98-
9994
#if MIN_VERSION_ghc(9,0,0)
10095
#if !MIN_VERSION_ghc(9,2,0)
10196
import qualified Data.Set as Set
@@ -105,6 +100,11 @@ import qualified Data.Set as Set
105100
import Data.IORef
106101
#endif
107102

103+
#if MIN_VERSION_ghc(9,3,0)
104+
hsc_EPS :: HscEnv -> UnitEnv
105+
hsc_EPS = hsc_unit_env
106+
#endif
107+
108108
#if !MIN_VERSION_ghc(9,2,0)
109109
type UnitEnv = ()
110110
newtype Logger = Logger { log_action :: LogAction }

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import DynFlags
2525
import Outputable (queryQual)
2626
#endif
2727
#if MIN_VERSION_ghc(9,3,0)
28-
import GHC.Types.Error
28+
import GHC.Types.Error
2929
#endif
3030

3131
putLogHook :: Logger -> HscEnv -> HscEnv

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

+6-7
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ import qualified GHC.Driver.Env as Env
2424
import GHC.Driver.Plugins (Plugin (..),
2525
PluginWithArgs (..),
2626
StaticPlugin (..),
27+
defaultPlugin, withPlugins)
2728
#if MIN_VERSION_ghc(9,3,0)
28-
staticPlugins,
29-
ParsedResult(..),
30-
PsMessages(..),
29+
import GHC.Driver.Plugins (ParsedResult (..),
30+
PsMessages (..),
31+
staticPlugins)
3132
#endif
32-
defaultPlugin, withPlugins)
3333
import qualified GHC.Runtime.Loader as Loader
3434
#elif MIN_VERSION_ghc(8,8,0)
3535
import qualified DynamicLoading as Loader
@@ -48,11 +48,10 @@ applyPluginsParsedResultAction env dflags ms hpm_annotations parsed = do
4848
-- Apply parsedResultAction of plugins
4949
let applyPluginAction p opts = parsedResultAction p opts ms
5050
#if MIN_VERSION_ghc(9,3,0)
51-
fmap (hpm_module . parsedResultModule) $
51+
fmap (hpm_module . parsedResultModule) $ runHsc env $ withPlugins
5252
#else
53-
fmap hpm_module $
53+
fmap hpm_module $ runHsc env $ withPlugins
5454
#endif
55-
runHsc env $ withPlugins
5655
#if MIN_VERSION_ghc(9,3,0)
5756
(Env.hsc_plugins env)
5857
#elif MIN_VERSION_ghc(9,2,0)

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ module Development.IDE.GHC.Compat.Units (
5252
showSDocForUser',
5353
) where
5454

55-
import qualified Data.List.NonEmpty as NE
56-
import qualified Data.Map.Strict as Map
57-
import Control.Monad
55+
import Control.Monad
56+
import qualified Data.List.NonEmpty as NE
57+
import qualified Data.Map.Strict as Map
5858
#if MIN_VERSION_ghc(9,3,0)
59-
import GHC.Unit.Home.ModInfo
59+
import GHC.Unit.Home.ModInfo
6060
#endif
6161
#if MIN_VERSION_ghc(9,0,0)
6262
#if MIN_VERSION_ghc(9,2,0)

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import GHC.ByteCode.Types
4444
import ByteCodeTypes
4545
#endif
4646
#if MIN_VERSION_ghc(9,3,0)
47-
import GHC.Types.PkgQual
47+
import GHC.Types.PkgQual
4848
#endif
4949

5050
-- Orphan instances for types from the GHC API.
@@ -217,8 +217,8 @@ instance NFData HomeModInfo where
217217

218218
#if MIN_VERSION_ghc(9,3,0)
219219
instance NFData PkgQual where
220-
rnf NoPkgQual = ()
221-
rnf (ThisPkg uid) = rnf uid
220+
rnf NoPkgQual = ()
221+
rnf (ThisPkg uid) = rnf uid
222222
rnf (OtherPkg uid) = rnf uid
223223

224224
instance NFData UnitId where

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-- Copyright (c) 2019 The DAML Authors. All rights reserved.
22
-- SPDX-License-Identifier: Apache-2.0
3+
{-# LANGUAGE CPP #-}
34
{-# LANGUAGE ExplicitNamespaces #-}
4-
{-# LANGUAGE CPP #-}
55

66
module Development.IDE.GHC.Warnings(withWarnings) where
77

@@ -49,8 +49,8 @@ attachReason Nothing d = d
4949
attachReason (Just wr) d = d{_code = InR <$> showReason wr}
5050
where
5151
showReason = \case
52-
WarningWithFlag flag -> showFlag flag
53-
_ -> Nothing
52+
WarningWithFlag flag -> showFlag flag
53+
_ -> Nothing
5454
#else
5555
attachReason :: WarnReason -> Diagnostic -> Diagnostic
5656
attachReason wr d = d{_code = InR <$> showReason wr}

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

+23-24
Original file line numberDiff line numberDiff line change
@@ -8,46 +8,45 @@ module Development.IDE.Plugin.Completions
88
, ghcideCompletionsPluginPriority
99
) where
1010

11-
import Control.Concurrent.Async (concurrently)
12-
import Control.Concurrent.STM.Stats (readTVarIO)
11+
import Control.Concurrent.Async (concurrently)
12+
import Control.Concurrent.STM.Stats (readTVarIO)
1313
import Control.Monad.Extra
1414
import Control.Monad.IO.Class
1515
import Control.Monad.Trans.Maybe
1616
import Data.Aeson
17-
import qualified Data.HashMap.Strict as Map
18-
import qualified Data.HashSet as Set
19-
import Data.List (find)
17+
import qualified Data.HashMap.Strict as Map
18+
import qualified Data.HashSet as Set
19+
import Data.List (find)
2020
import Data.Maybe
21-
import qualified Data.Text as T
21+
import qualified Data.Text as T
2222
import Development.IDE.Core.PositionMapping
2323
import Development.IDE.Core.RuleTypes
24-
import Development.IDE.Core.Service hiding (Log,
25-
LogShake)
26-
import Development.IDE.Core.Shake hiding (Log)
27-
import qualified Development.IDE.Core.Shake as Shake
24+
import Development.IDE.Core.Service hiding (Log, LogShake)
25+
import Development.IDE.Core.Shake hiding (Log)
26+
import qualified Development.IDE.Core.Shake as Shake
2827
import Development.IDE.GHC.Compat
29-
import Development.IDE.GHC.Error (rangeToSrcSpan)
30-
import Development.IDE.GHC.Util (printOutputable)
28+
import Development.IDE.GHC.Error (rangeToSrcSpan)
29+
import Development.IDE.GHC.Util (printOutputable)
3130
import Development.IDE.Graph
3231
import Development.IDE.Plugin.Completions.Logic
3332
import Development.IDE.Plugin.Completions.Types
3433
import Development.IDE.Types.Exports
35-
import Development.IDE.Types.HscEnvEq (HscEnvEq (envPackageExports),
36-
hscEnv)
37-
import qualified Development.IDE.Types.KnownTargets as KT
34+
import Development.IDE.Types.HscEnvEq (HscEnvEq (envPackageExports),
35+
hscEnv)
36+
import qualified Development.IDE.Types.KnownTargets as KT
3837
import Development.IDE.Types.Location
39-
import Development.IDE.Types.Logger (Pretty (pretty),
40-
Recorder,
41-
WithPriority,
42-
cmapWithPrio)
43-
import GHC.Exts (fromList, toList)
44-
import Ide.Plugin.Config (Config)
38+
import Development.IDE.Types.Logger (Pretty (pretty),
39+
Recorder,
40+
WithPriority,
41+
cmapWithPrio)
42+
import GHC.Exts (fromList, toList)
43+
import Ide.Plugin.Config (Config)
4544
import Ide.Types
46-
import qualified Language.LSP.Server as LSP
45+
import qualified Language.LSP.Server as LSP
4746
import Language.LSP.Types
48-
import qualified Language.LSP.VFS as VFS
47+
import qualified Language.LSP.VFS as VFS
4948
import Numeric.Natural
50-
import Text.Fuzzy.Parallel (Scored (..))
49+
import Text.Fuzzy.Parallel (Scored (..))
5150

5251
data Log = LogShake Shake.Log deriving Show
5352

‎ghcide/src/Development/IDE/Spans/Common.hs

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,11 @@ safeTyThingId (AConLike (RealDataCon dataCon)) = Just (dataConWrapId dataCon)
4949
safeTyThingId _ = Nothing
5050

5151
-- Possible documentation for an element in the code
52-
data SpanDoc
5352
#if MIN_VERSION_ghc(9,3,0)
53+
data SpanDoc
5454
= SpanDocString [HsDocString] SpanDocUris
5555
#else
56+
data SpanDoc
5657
= SpanDocString HsDocString SpanDocUris
5758
#endif
5859
| SpanDocText [T.Text] SpanDocUris

‎ghcide/src/Development/IDE/Spans/Documentation.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import System.FilePath
3434

3535
import Language.LSP.Types (filePathToUri, getUri)
3636
#if MIN_VERSION_ghc(9,3,0)
37-
import GHC.Types.Unique.Map
37+
import GHC.Types.Unique.Map
3838
#endif
3939

4040
mkDocMap

‎hls-plugin-api/src/Ide/Types.hs

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ import Control.Monad (void)
5656
import qualified System.Posix.Process as P (getProcessID)
5757
import System.Posix.Signals
5858
#endif
59+
import Control.Applicative ((<|>))
5960
import Control.Arrow ((&&&))
6061
import Control.Lens ((^.))
6162
import Data.Aeson hiding (defaultOptions)
@@ -67,7 +68,7 @@ import Data.GADT.Compare
6768
import Data.Hashable (Hashable)
6869
import Data.HashMap.Strict (HashMap)
6970
import qualified Data.HashMap.Strict as HashMap
70-
import Data.List.Extra (sortOn, find)
71+
import Data.List.Extra (find, sortOn)
7172
import Data.List.NonEmpty (NonEmpty (..), toList)
7273
import qualified Data.Map as Map
7374
import Data.Maybe
@@ -107,12 +108,11 @@ import Options.Applicative (ParserInfo)
107108
import System.FilePath
108109
import System.IO.Unsafe
109110
import Text.Regex.TDFA.Text ()
110-
import Control.Applicative ((<|>))
111111

112112
-- ---------------------------------------------------------------------
113113

114114
data IdePlugins ideState = IdePlugins_
115-
{ ipMap_ :: HashMap PluginId (PluginDescriptor ideState)
115+
{ ipMap_ :: HashMap PluginId (PluginDescriptor ideState)
116116
, lookupCommandProvider :: CommandId -> Maybe PluginId
117117
}
118118

‎plugins/hls-code-range-plugin/src/Ide/Plugin/CodeRange/Rules.hs

+1-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ import Development.IDE
4545
import Development.IDE.Core.Rules (toIdeResult)
4646
import qualified Development.IDE.Core.Shake as Shake
4747
import Development.IDE.GHC.Compat (HieAST (..),
48-
HieASTs (getAsts),
49-
RefMap)
48+
HieASTs (getAsts), RefMap)
5049
import Development.IDE.GHC.Compat.Util
5150
import GHC.Generics (Generic)
5251
import Ide.Plugin.CodeRange.ASTPreProcess (CustomNodeType (..),

‎plugins/hls-refactor-plugin/src/Development/IDE/GHC/Dump.hs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
{-# LANGUAGE CPP #-}
22
module Development.IDE.GHC.Dump(showAstDataHtml) where
3-
import Data.Data hiding (Fixity)
4-
import Development.IDE.GHC.Compat hiding (NameAnn)
3+
import Data.Data hiding (Fixity)
4+
import Development.IDE.GHC.Compat hiding (NameAnn)
55
import Development.IDE.GHC.Compat.ExactPrint
66
#if MIN_VERSION_ghc(8,10,1)
77
import GHC.Hs.Dump
88
#else
99
import HsDumpAst
1010
#endif
1111
#if MIN_VERSION_ghc(9,2,1)
12-
import qualified Data.ByteString as B
12+
import qualified Data.ByteString as B
1313
import Development.IDE.GHC.Compat.Util
14-
import Generics.SYB (ext1Q, ext2Q, extQ)
14+
import Generics.SYB (ext1Q, ext2Q, extQ)
1515
import GHC.Hs
1616
#endif
1717
#if MIN_VERSION_ghc(9,0,1)
1818
import GHC.Plugins
1919
#else
2020
import GhcPlugins
2121
#endif
22-
import Prelude hiding ((<>))
22+
import Prelude hiding ((<>))
2323

2424
-- | Show a GHC syntax tree in HTML.
2525
#if MIN_VERSION_ghc(9,2,1)

‎plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction/Util.hs

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
module Development.IDE.Plugin.CodeAction.Util where
22

3-
#if MIN_VERSION_ghc(9,2,0)
4-
import GHC.Utils.Outputable
5-
#else
6-
import Development.IDE.GHC.Util
7-
import Development.IDE.GHC.Compat.Util
8-
import Development.IDE.GHC.Compat
9-
#endif
103
import Data.Data (Data)
114
import qualified Data.Unique as U
125
import Debug.Trace
@@ -18,6 +11,13 @@ import Text.Printf
1811
import Development.IDE.GHC.Dump (showAstDataHtml)
1912
import Data.Time.Clock.POSIX (POSIXTime, getCurrentTime,
2013
utcTimeToPOSIXSeconds)
14+
#if MIN_VERSION_ghc(9,2,0)
15+
import GHC.Utils.Outputable
16+
#else
17+
import Development.IDE.GHC.Util
18+
import Development.IDE.GHC.Compat.Util
19+
import Development.IDE.GHC.Compat
20+
#endif
2121
--------------------------------------------------------------------------------
2222
-- Tracing exactprint terms
2323

‎plugins/hls-rename-plugin/src/Ide/Plugin/Rename.hs

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import qualified Data.Map as M
2929
import Data.Maybe
3030
import Data.Mod.Word
3131
import qualified Data.Text as T
32-
import Development.IDE (Recorder, WithPriority)
32+
import Development.IDE (Recorder, WithPriority)
3333
import Development.IDE.Core.PositionMapping
3434
import Development.IDE.Core.RuleTypes
3535
import Development.IDE.Core.Service
@@ -40,10 +40,10 @@ import Development.IDE.GHC.Compat.Parser
4040
import Development.IDE.GHC.Compat.Units
4141
import Development.IDE.GHC.Error
4242
import Development.IDE.GHC.ExactPrint
43-
import qualified Development.IDE.GHC.ExactPrint as E
43+
import qualified Development.IDE.GHC.ExactPrint as E
44+
import Development.IDE.Plugin.CodeAction
4445
import Development.IDE.Spans.AtPoint
4546
import Development.IDE.Types.Location
46-
import Development.IDE.Plugin.CodeAction
4747
import HieDb.Query
4848
import Ide.Plugin.Properties
4949
import Ide.PluginUtils

‎test/functional/Format.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import Control.Lens ((^.))
66
import Control.Monad.IO.Class
77
import Data.Aeson
88
import qualified Data.ByteString.Lazy as BS
9+
import qualified Data.Text as T
910
import qualified Data.Text.Encoding as T
1011
import qualified Data.Text.IO as T
11-
import qualified Data.Text as T
1212
import Language.LSP.Test
1313
import Language.LSP.Types
1414
import qualified Language.LSP.Types.Lens as LSP

0 commit comments

Comments
 (0)