Compute completions on kick

This is not only for faster completions.
 It's also needed to have semi-fresh completions after editing.
This is specially important for the first completion request of a file - without this change there are no  completions available at all

Author: pepeiborra

ghcide/src/Development/IDE/Core/OfInterest.hs

@@ -20,18 +20,19 @@ module Development.IDE.Core.OfInterest(
 import           Control.Concurrent.Strict
 import           Control.Monad
 import           Control.Monad.IO.Class
-import           Data.HashMap.Strict                    (HashMap)
-import qualified Data.HashMap.Strict                    as HashMap
-import qualified Data.Text                              as T
+import           Data.HashMap.Strict                      (HashMap)
+import qualified Data.HashMap.Strict                      as HashMap
+import qualified Data.Text                                as T
 import           Development.IDE.Graph
 
-import           Control.Concurrent.STM.Stats           (atomically,
-                                                         modifyTVar')
-import qualified Data.ByteString                        as BS
-import           Data.Maybe                             (catMaybes)
+import           Control.Concurrent.STM.Stats             (atomically,
+                                                           modifyTVar')
+import qualified Data.ByteString                          as BS
+import           Data.Maybe                               (catMaybes)
 import           Development.IDE.Core.ProgressReporting
 import           Development.IDE.Core.RuleTypes
 import           Development.IDE.Core.Shake
+import           Development.IDE.Plugin.Completions.Types
 import           Development.IDE.Types.Exports
 import           Development.IDE.Types.Location
 import           Development.IDE.Types.Logger
@@ -113,7 +114,11 @@ kick = do
     liftIO $ progressUpdate progress KickStarted
 
     -- Update the exports map
-    results <- uses GenerateCore files <* uses GetHieAst files
+    results <- uses GenerateCore files
+            <* uses GetHieAst files
+            -- needed to have non local completions on the first edit
+            -- when the first edit breaks the module header
+            <* uses NonLocalCompletions files
     let mguts = catMaybes results
     void $ liftIO $ atomically $ modifyTVar' exportsMap (updateExportsMapMg mguts)
 

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

@@ -3,8 +3,6 @@
 
 module Development.IDE.Plugin.Completions
     ( descriptor
-    , LocalCompletions(..)
-    , NonLocalCompletions(..)
     ) where
 
 import           Control.Concurrent.Async                     (concurrently)
@@ -29,7 +27,6 @@ import           Development.IDE.GHC.ExactPrint               (Annotated (annsA)
                                                                astA)
 import           Development.IDE.GHC.Util                     (prettyPrint)
 import           Development.IDE.Graph
-import           Development.IDE.Graph.Classes
 import           Development.IDE.Plugin.CodeAction            (newImport,
                                                                newImportToEdit)
 import           Development.IDE.Plugin.CodeAction.ExactPrint
@@ -41,7 +38,6 @@ import           Development.IDE.Types.HscEnvEq               (HscEnvEq (envPack
 import qualified Development.IDE.Types.KnownTargets           as KT
 import           Development.IDE.Types.Location
 import           GHC.Exts                                     (fromList, toList)
-import           GHC.Generics
 import           Ide.Plugin.Config                            (Config)
 import           Ide.Types
 import qualified Language.LSP.Server                          as LSP
@@ -98,20 +94,6 @@ dropListFromImportDecl iDecl = let
     f x = x
     in f <$> iDecl
 
--- | Produce completions info for a file
-type instance RuleResult LocalCompletions = CachedCompletions
-type instance RuleResult NonLocalCompletions = CachedCompletions
-
-data LocalCompletions = LocalCompletions
-    deriving (Eq, Show, Typeable, Generic)
-instance Hashable LocalCompletions
-instance NFData   LocalCompletions
-
-data NonLocalCompletions = NonLocalCompletions
-    deriving (Eq, Show, Typeable, Generic)
-instance Hashable NonLocalCompletions
-instance NFData   NonLocalCompletions
-
 -- | Generate code actions.
 getCompletionsLSP
     :: IdeState

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

@@ -2,6 +2,7 @@
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE GADTs              #-}
 {-# LANGUAGE OverloadedLabels   #-}
+{-# LANGUAGE TypeFamilies       #-}
 module Development.IDE.Plugin.Completions.Types (
   module Development.IDE.Plugin.Completions.Types
 ) where
@@ -11,8 +12,11 @@ import qualified Data.Map                     as Map
 import qualified Data.Text                    as T
 
 import           Data.Aeson                   (FromJSON, ToJSON)
+import           Data.Hashable                (Hashable)
 import           Data.Text                    (Text)
+import           Data.Typeable                (Typeable)
 import           Development.IDE.GHC.Compat
+import           Development.IDE.Graph        (RuleResult)
 import           Development.IDE.Spans.Common
 import           GHC.Generics                 (Generic)
 import           Ide.Plugin.Config            (Config)
@@ -23,6 +27,20 @@ import           Ide.Types                    (PluginId)
 import           Language.LSP.Server          (MonadLsp)
 import           Language.LSP.Types           (CompletionItemKind (..), Uri)
 
+-- | Produce completions info for a file
+type instance RuleResult LocalCompletions = CachedCompletions
+type instance RuleResult NonLocalCompletions = CachedCompletions
+
+data LocalCompletions = LocalCompletions
+    deriving (Eq, Show, Typeable, Generic)
+instance Hashable LocalCompletions
+instance NFData   LocalCompletions
+
+data NonLocalCompletions = NonLocalCompletions
+    deriving (Eq, Show, Typeable, Generic)
+instance Hashable NonLocalCompletions
+instance NFData   NonLocalCompletions
+
 -- From haskell-ide-engine/src/Haskell/Ide/Engine/LSP/Completions.hs
 
 data Backtick = Surrounded | LeftSide