Skip to content

Commit e69c0e9

Browse files
committed
fix plugins from rebase
1 parent 4840675 commit e69c0e9

File tree

1 file changed

+26
-27
lines changed

1 file changed

+26
-27
lines changed

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

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,47 +8,46 @@ 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
47-
import qualified Language.LSP.VFS as VFS
45+
import qualified Language.LSP.Server as LSP
46+
import qualified Language.LSP.VFS as VFS
4847
import Numeric.Natural
49-
import Text.Fuzzy.Parallel (Scored (..))
48+
import Text.Fuzzy.Parallel (Scored (..))
5049

51-
import qualified GHC.LanguageExtensions as LangExt
50+
import qualified GHC.LanguageExtensions as LangExt
5251
import Language.LSP.Types
5352

5453
data Log = LogShake Shake.Log deriving Show
@@ -167,8 +166,8 @@ getCompletionsLSP ide plId
167166
let clientCaps = clientCapabilities $ shakeExtras ide
168167
plugins = idePlugins $ shakeExtras ide
169168
config <- getCompletionsConfig plId
170-
171-
allCompletions <- liftIO $ getCompletions plId ideOpts cci' parsedMod astres bindMap pfix' clientCaps config moduleExports
169+
170+
allCompletions <- liftIO $ getCompletions plugins ideOpts cci' parsedMod astres bindMap pfix' clientCaps config moduleExports
172171
pure $ InL (List $ orderedCompletions allCompletions)
173172
_ -> return (InL $ List [])
174173
_ -> return (InL $ List [])

0 commit comments

Comments
 (0)