Extract completions into an HLS plugin

We might want to break them down into multiple HLS plugins
later on (local, non local, and module header).

Author: pepeiborra

exe/Plugins.hs

@@ -10,6 +10,7 @@ import           Ide.Plugin.Example        as Example
 import           Ide.Plugin.Example2       as Example2
 import           Development.IDE           (IdeState)
 import           Development.IDE.Plugin.HLS.GhcIde as GhcIde
+import           Development.IDE.Plugin.Completions as Completions
 import           Development.IDE.Plugin.TypeLenses as TypeLenses
 
 -- haskell-language-server optional plugins
@@ -92,6 +93,7 @@ idePlugins includeExamples = pluginDescToIdePlugins allPlugins
     basePlugins =
       [ GhcIde.descriptor  "ghcide"
       , TypeLenses.descriptor "type-lenses"
+      , Completions.descriptor "completions"
 #if pragmas
       , Pragmas.descriptor  "pragmas"
 #endif

ghcide/exe/Main.hs

@@ -28,6 +28,7 @@ import Development.IDE.Types.Diagnostics
 import Development.IDE.Types.Options
 import Development.IDE.Types.Logger
 import Development.IDE.Plugin
+import Development.IDE.Plugin.Completions as Completions
 import Development.IDE.Plugin.TypeLenses as TypeLenses
 import Development.IDE.Plugin.Test as Test
 import Development.IDE.Session (loadSession)
@@ -91,6 +92,7 @@ main = do
     let hlsPlugins = pluginDescToIdePlugins $
             [ GhcIde.descriptor "ghcide"
             , TypeLenses.descriptor "type-lenses"
+            , Completions.descriptor "ghcide-completions"
             ] ++
             [ Test.blockCommandDescriptor "block-command" | argsTesting]
 

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

@@ -3,9 +3,10 @@
 #include "ghc-api-version.h"
 
 module Development.IDE.Plugin.Completions
-    (
-      produceCompletions
-    , getCompletionsLSP
+    ( descriptor
+    , ProduceCompletions(..)
+    , LocalCompletions(..)
+    , NonLocalCompletions(..)
     ) where
 import Language.Haskell.LSP.Types
 import qualified Language.Haskell.LSP.Core as LSP
@@ -27,6 +28,13 @@ import TcRnDriver (tcRnImportDecls)
 import Data.Maybe
 import Ide.Plugin.Config (Config (completionSnippetsOn))
 import Ide.PluginUtils (getClientConfig)
+import Ide.Types
+
+descriptor :: PluginId -> PluginDescriptor IdeState
+descriptor plId = (defaultPluginDescriptor plId)
+  { pluginRules = produceCompletions
+  , pluginCompletionProvider = Just getCompletionsLSP
+  }
 
 #if defined(GHC_LIB)
 import Development.IDE.Import.DependencyInformation

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

@@ -49,11 +49,11 @@ import Development.IDE.GHC.Util
 import Outputable (Outputable)
 import qualified Data.Set as Set
 import ConLike
-
 import GhcPlugins (
     flLabel,
     unpackFS)
 import Data.Either (fromRight)
+import Ide.Types(WithSnippets(..))
 
 -- From haskell-ide-engine/hie-plugin-api/Haskell/Ide/Engine/Context.hs
 
@@ -443,8 +443,6 @@ findRecordCompl _ _ _ = []
 ppr :: Outputable a => a -> T.Text
 ppr = T.pack . prettyPrint
 
-newtype WithSnippets = WithSnippets Bool
-
 toggleSnippets :: ClientCapabilities -> WithSnippets -> CompletionItem -> CompletionItem
 toggleSnippets ClientCapabilities { _textDocument } (WithSnippets with) x
   | with && supported = x

ghcide/src/Development/IDE/Plugin/HLS/GhcIde.hs

@@ -7,7 +7,6 @@ module Development.IDE.Plugin.HLS.GhcIde
     descriptor
   ) where
 import Development.IDE
-import Development.IDE.Plugin.Completions as Completions
 import Development.IDE.Plugin.CodeAction as CodeAction
 import Development.IDE.LSP.HoverDefinition
 import Development.IDE.LSP.Outline
@@ -23,8 +22,7 @@ descriptor plId = (defaultPluginDescriptor plId)
   { pluginCodeActionProvider = Just codeAction'
   , pluginHoverProvider      = Just hover'
   , pluginSymbolsProvider    = Just symbolsProvider
-  , pluginCompletionProvider = Just getCompletionsLSP
-  , pluginRules              = produceCompletions <> rulePackageExports
+  , pluginRules              = rulePackageExports
   }
 
 -- ---------------------------------------------------------------------