@@ -28,8 +28,6 @@ import Development.IDE.Types.Diagnostics
28
28
import Development.IDE.Types.Options
29
29
import Development.IDE.Types.Logger
30
30
import Development.IDE.Plugin
31
- import Development.IDE.Plugin.Completions as Completions
32
- import Development.IDE.Plugin.CodeAction as CodeAction
33
31
import Development.IDE.Plugin.Test as Test
34
32
import Development.IDE.Session (loadSession )
35
33
import qualified Language.Haskell.LSP.Core as LSP
@@ -54,6 +52,8 @@ import Development.IDE (action)
54
52
import Text.Printf
55
53
import Development.IDE.Core.Tracing
56
54
import Development.IDE.Types.Shake (Key (Key ))
55
+ import Development.IDE.Plugin.HLS (asGhcIdePlugin )
56
+ import Development.IDE.Plugin.HLS.GhcIde as GhcIde
57
57
import Ide.Plugin.Config
58
58
import Ide.PluginUtils (allLspCmdIds' , getProcessID , pluginDescToIdePlugins )
59
59
@@ -85,9 +85,14 @@ main = do
85
85
whenJust argsCwd IO. setCurrentDirectory
86
86
87
87
dir <- IO. getCurrentDirectory
88
- command <- makeLspCommandId " typesignature.add"
89
88
90
- let plugins = Completions. plugin <> CodeAction. plugin
89
+ let hlsPlugins = pluginDescToIdePlugins [GhcIde. descriptor " ghcide" ]
90
+
91
+ pid <- T. pack . show <$> getProcessID
92
+ let hlsPlugin = asGhcIdePlugin hlsPlugins
93
+ hlsCommands = allLspCmdIds' pid hlsPlugins
94
+
95
+ let plugins = hlsPlugin
91
96
<> if argsTesting then Test. plugin else mempty
92
97
onInitialConfiguration :: InitializeRequest -> Either T. Text Config
93
98
onInitialConfiguration x = case x ^. params . initializationOptions of
@@ -96,7 +101,7 @@ main = do
96
101
J. Error err -> Left $ T. pack err
97
102
J. Success a -> Right a
98
103
onConfigurationChange = const $ Left " Updating Not supported"
99
- options = def { LSP. executeCommandCommands = Just [command]
104
+ options = def { LSP. executeCommandCommands = Just hlsCommands
100
105
, LSP. completionTriggerCharacters = Just " ."
101
106
}
102
107
0 commit comments