Fix priority for pragma completions

haskell · Aug 19, 2022 · ccefa4e · ccefa4e
1 parent 7d52848
commit ccefa4e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/ghcide/src/Development/IDE/Plugin/Completions.hs b/ghcide/src/Development/IDE/Plugin/Completions.hs
@@ -5,6 +5,7 @@
 module Development.IDE.Plugin.Completions
     ( descriptor
     , Log(..)
+    , ghcideCompletionsPluginPriority
     ) where
 
 import           Control.Concurrent.Async                     (concurrently)
@@ -49,6 +50,7 @@ import           Ide.Types
 import qualified Language.LSP.Server                          as LSP
 import           Language.LSP.Types
 import qualified Language.LSP.VFS                             as VFS
+import           Numeric.Natural
 import           Text.Fuzzy.Parallel                          (Scored (..))
 
 data Log = LogShake Shake.Log deriving Show
@@ -57,12 +59,16 @@ instance Pretty Log where
   pretty = \case
     LogShake log -> pretty log
 
+ghcideCompletionsPluginPriority :: Natural
+ghcideCompletionsPluginPriority = defaultPluginPriority
+
 descriptor :: Recorder (WithPriority Log) -> PluginId -> PluginDescriptor IdeState
 descriptor recorder plId = (defaultPluginDescriptor plId)
   { pluginRules = produceCompletions recorder
   , pluginHandlers = mkPluginHandler STextDocumentCompletion getCompletionsLSP
   , pluginCommands = [extendImportCommand]
   , pluginConfigDescriptor = defaultConfigDescriptor {configCustomConfig = mkCustomConfig properties}
+  , pluginPriority = ghcideCompletionsPluginPriority
   }
 
 produceCompletions :: Recorder (WithPriority Log) -> Rules ()

diff --git a/plugins/hls-pragmas-plugin/src/Ide/Plugin/Pragmas.hs b/plugins/hls-pragmas-plugin/src/Ide/Plugin/Pragmas.hs
@@ -14,28 +14,30 @@ module Ide.Plugin.Pragmas
   , validPragmas
   ) where
 
-import           Control.Lens                  hiding (List)
-import           Control.Monad.IO.Class        (MonadIO (liftIO))
-import qualified Data.HashMap.Strict           as H
-import           Data.List.Extra               (nubOrdOn)
-import           Data.Maybe                    (catMaybes)
-import qualified Data.Text                     as T
+import           Control.Lens                       hiding (List)
+import           Control.Monad.IO.Class             (MonadIO (liftIO))
+import qualified Data.HashMap.Strict                as H
+import           Data.List.Extra                    (nubOrdOn)
+import           Data.Maybe                         (catMaybes)
+import qualified Data.Text                          as T
 import           Development.IDE
 import           Development.IDE.GHC.Compat
-import qualified Development.IDE.Spans.Pragmas as Pragmas
+import           Development.IDE.Plugin.Completions (ghcideCompletionsPluginPriority)
+import qualified Development.IDE.Spans.Pragmas      as Pragmas
 import           Ide.Types
-import qualified Language.LSP.Server           as LSP
-import qualified Language.LSP.Types            as J
-import qualified Language.LSP.Types.Lens       as J
-import qualified Language.LSP.VFS              as VFS
-import qualified Text.Fuzzy                    as Fuzzy
+import qualified Language.LSP.Server                as LSP
+import qualified Language.LSP.Types                 as J
+import qualified Language.LSP.Types.Lens            as J
+import qualified Language.LSP.VFS                   as VFS
+import qualified Text.Fuzzy                         as Fuzzy
 
 -- ---------------------------------------------------------------------
 
 descriptor :: PluginId -> PluginDescriptor IdeState
 descriptor plId = (defaultPluginDescriptor plId)
   { pluginHandlers = mkPluginHandler J.STextDocumentCodeAction codeActionProvider
                   <> mkPluginHandler J.STextDocumentCompletion completion
+  , pluginPriority = ghcideCompletionsPluginPriority + 1
   }
 
 -- ---------------------------------------------------------------------