Skip to content

Commit 4f6eee5

Browse files
drsoochdrsooch
committed
Looks like formatting was missed
1 parent cffc9ce commit 4f6eee5

File tree

7 files changed

+79
-79
lines changed

7 files changed

+79
-79
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ import GHC.Stack (HasCallStack)
158158
import HieDb.Types
159159
import Ide.Plugin.Config
160160
import qualified Ide.PluginUtils as HLS
161-
import Ide.Types (PluginId, IdePlugins)
161+
import Ide.Types (IdePlugins, PluginId)
162162
import Language.LSP.Diagnostics
163163
import qualified Language.LSP.Server as LSP
164164
import Language.LSP.Types

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

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

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

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

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -23,41 +23,42 @@ module Ide.Plugin.CodeRange.Rules
2323
, simplify
2424
) where
2525

26-
import Control.DeepSeq (NFData)
27-
import qualified Control.Lens as Lens
28-
import Control.Monad (foldM)
29-
import Control.Monad.Except (ExceptT (..), runExceptT)
30-
import Control.Monad.Reader (runReader)
31-
import Control.Monad.Trans.Class (lift)
32-
import Control.Monad.Trans.Maybe (MaybeT (MaybeT),
33-
maybeToExceptT)
26+
import Control.DeepSeq (NFData)
27+
import qualified Control.Lens as Lens
28+
import Control.Monad (foldM)
29+
import Control.Monad.Except (ExceptT (..),
30+
runExceptT)
31+
import Control.Monad.Reader (runReader)
32+
import Control.Monad.Trans.Class (lift)
33+
import Control.Monad.Trans.Maybe (MaybeT (MaybeT),
34+
maybeToExceptT)
3435
import Control.Monad.Trans.Writer.CPS
35-
import Data.Coerce (coerce)
36-
import Data.Data (Typeable)
37-
import Data.Foldable (traverse_)
38-
import Data.Function (on, (&))
36+
import Data.Coerce (coerce)
37+
import Data.Data (Typeable)
38+
import Data.Foldable (traverse_)
39+
import Data.Function (on, (&))
3940
import Data.Hashable
40-
import Data.List (sort)
41-
import qualified Data.Map.Strict as Map
42-
import Data.Vector (Vector)
43-
import qualified Data.Vector as V
41+
import Data.List (sort)
42+
import qualified Data.Map.Strict as Map
43+
import Data.Vector (Vector)
44+
import qualified Data.Vector as V
4445
import Development.IDE
45-
import Development.IDE.Core.Rules (toIdeResult)
46-
import qualified Development.IDE.Core.Shake as Shake
46+
import Development.IDE.Core.Rules (toIdeResult)
47+
import qualified Development.IDE.Core.Shake as Shake
48+
import Development.IDE.GHC.Compat (HieAST (..),
49+
HieASTs (getAsts),
50+
ParsedSource, RefMap)
4751
import Development.IDE.GHC.Compat.ExactPrint (Annotated)
48-
import Development.IDE.GHC.Compat (HieAST (..),
49-
HieASTs (getAsts),
50-
ParsedSource, RefMap)
5152
import Development.IDE.GHC.Compat.Util
52-
import Development.IDE.GHC.ExactPrint (GetAnnotatedParsedSource (GetAnnotatedParsedSource))
53-
import GHC.Generics (Generic)
54-
import Ide.Plugin.CodeRange.ASTPreProcess (CustomNodeType (..),
55-
PreProcessEnv (..),
56-
isCustomNode,
57-
preProcessAST)
58-
import Language.LSP.Types.Lens (HasEnd (end),
59-
HasStart (start))
60-
import Prelude hiding (log)
53+
import Development.IDE.GHC.ExactPrint (GetAnnotatedParsedSource (GetAnnotatedParsedSource))
54+
import GHC.Generics (Generic)
55+
import Ide.Plugin.CodeRange.ASTPreProcess (CustomNodeType (..),
56+
PreProcessEnv (..),
57+
isCustomNode,
58+
preProcessAST)
59+
import Language.LSP.Types.Lens (HasEnd (end),
60+
HasStart (start))
61+
import Prelude hiding (log)
6162

6263
data Log = LogShake Shake.Log
6364
| LogNoAST

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

Lines changed: 5 additions & 5 deletions
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/test/Main.hs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,64 @@
1-
{-# LANGUAGE LambdaCase #-}
2-
{-# LANGUAGE OverloadedStrings #-}
31
{-# LANGUAGE AllowAmbiguousTypes #-}
42
{-# LANGUAGE CPP #-}
53
{-# LANGUAGE DataKinds #-}
64
{-# LANGUAGE DuplicateRecordFields #-}
75
{-# LANGUAGE GADTs #-}
86
{-# LANGUAGE ImplicitParams #-}
7+
{-# LANGUAGE LambdaCase #-}
98
{-# LANGUAGE MultiWayIf #-}
9+
{-# LANGUAGE NamedFieldPuns #-}
10+
{-# LANGUAGE OverloadedStrings #-}
1011
{-# LANGUAGE PatternSynonyms #-}
1112
{-# LANGUAGE PolyKinds #-}
12-
{-# LANGUAGE TypeOperators #-}
13-
{-# LANGUAGE NamedFieldPuns #-}
1413
{-# LANGUAGE RecordWildCards #-}
14+
{-# LANGUAGE TypeOperators #-}
1515
{-# OPTIONS_GHC -Wno-deprecations -Wno-unticked-promoted-constructors #-}
1616

1717
module Main
1818
( main
1919
) where
2020

2121
import Control.Applicative.Combinators
22+
import Control.Lens ((^.))
2223
import Control.Monad
2324
import Data.Default
2425
import Data.Foldable
2526
import Data.List.Extra
2627
import Data.Maybe
2728
import qualified Data.Text as T
28-
import Development.IDE.Test
29+
import Data.Tuple.Extra
2930
import Development.IDE.GHC.Util
3031
import Development.IDE.Plugin.Completions.Types (extendImportCommandId)
32+
import Development.IDE.Test
3133
import Development.IDE.Types.Location
3234
import Development.Shake (getDirectoryFilesIO)
35+
import Ide.Types
3336
import Language.LSP.Test
3437
import Language.LSP.Types hiding
3538
(SemanticTokenAbsolute (length, line),
3639
SemanticTokenRelative (length),
3740
SemanticTokensEdit (_start),
3841
mkRange)
39-
import qualified Language.LSP.Types.Lens as L
42+
import qualified Language.LSP.Types as LSP
4043
import Language.LSP.Types.Capabilities
44+
import qualified Language.LSP.Types.Lens as L
4145
import System.Directory
4246
import System.FilePath
4347
import System.Info.Extra (isMac, isWindows)
4448
import qualified System.IO.Extra
4549
import System.IO.Extra hiding (withTempDir)
46-
import Control.Lens ((^.))
47-
import Data.Tuple.Extra
48-
import Ide.Types
49-
import qualified Language.LSP.Types as LSP
5050
import System.Time.Extra
5151
import Test.Tasty
5252
import Test.Tasty.ExpectedFailure
5353
import Test.Tasty.HUnit
5454
import Text.Regex.TDFA ((=~))
5555

5656

57-
import Test.Hls
5857
import Development.IDE.Plugin.CodeAction (matchRegExMultipleImports)
58+
import Test.Hls
5959

60-
import qualified Development.IDE.Plugin.CodeAction as Refactor
61-
import qualified Development.IDE.Plugin.HLS.GhcIde as GhcIde
60+
import qualified Development.IDE.Plugin.CodeAction as Refactor
61+
import qualified Development.IDE.Plugin.HLS.GhcIde as GhcIde
6262

6363
main :: IO ()
6464
main = defaultTestRunner tests

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

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

0 commit comments

Comments
 (0)