Merge branch 'master' into tactics

Author: isovector

cabal.project

@@ -20,6 +20,6 @@ package ghcide
 
 write-ghc-environment-files: never
 
-index-state: 2020-08-07T11:45:57Z
+index-state: 2020-09-09T00:00:00Z
 
 allow-newer: data-tree-print:base

hls-plugin-api/src/Ide/Plugin/GhcIde.hs

@@ -39,7 +39,7 @@ hover' ideState params = do
 
 commandAddSignature :: CommandFunction WorkspaceEdit
 commandAddSignature lf ide params
-    = executeAddSignatureCommand lf ide (ExecuteCommandParams "typesignature.add" (Just (List [toJSON params])) Nothing)
+    = commandHandler lf ide (ExecuteCommandParams "typesignature.add" (Just (List [toJSON params])) Nothing)
 
 -- ---------------------------------------------------------------------
 

plugins/default/src/Ide/Plugin/Example.hs

@@ -19,7 +19,6 @@ import Data.Aeson
 import Data.Binary
 import Data.Functor
 import qualified Data.HashMap.Strict as Map
-import qualified Data.HashSet as HashSet
 import Data.Hashable
 import qualified Data.Text as T
 import Data.Typeable
@@ -76,7 +75,7 @@ exampleRules = do
 
   action $ do
     files <- getFilesOfInterest
-    void $ uses Example $ HashSet.toList files
+    void $ uses Example $ Map.keys files
 
 mkDiag :: NormalizedFilePath
        -> DiagnosticSource

plugins/default/src/Ide/Plugin/Example2.hs

@@ -19,7 +19,6 @@ import Data.Aeson
 import Data.Binary
 import Data.Functor
 import qualified Data.HashMap.Strict as Map
-import qualified Data.HashSet as HashSet
 import Data.Hashable
 import qualified Data.Text as T
 import Data.Typeable
@@ -75,7 +74,7 @@ exampleRules = do
 
   action $ do
     files <- getFilesOfInterest
-    void $ uses Example2 $ HashSet.toList files
+    void $ uses Example2 $ Map.keys files
 
 mkDiag :: NormalizedFilePath
        -> DiagnosticSource

plugins/default/src/Ide/Plugin/ImportLens.hs

@@ -25,7 +25,6 @@ import qualified Data.Map.Strict                as Map
 import           Data.Maybe                     (catMaybes, fromMaybe)
 import qualified Data.Text                      as T
 import           Development.IDE
-import           Development.IDE.Core.Shake (useWithStale)
 import           Development.IDE.GHC.Compat
 import           GHC.Generics                   (Generic)
 import           Ide.Plugin

plugins/default/src/Ide/Plugin/Retrie.hs

@@ -41,7 +41,7 @@ import qualified Data.Text                      as T
 import qualified Data.Text.IO                   as T
 import           Data.Typeable                  (Typeable)
 import           Development.IDE
-import           Development.IDE.Core.Shake     (ShakeExtras(knownFilesVar))
+import           Development.IDE.Core.Shake     (toKnownFiles, ShakeExtras(knownTargetsVar))
 import           Development.IDE.GHC.Compat     (GenLocated (L), GhcRn,
                                                  HsBindLR (FunBind),
                                                  HsGroup (..),
@@ -334,7 +334,7 @@ callRetrie ::
   Bool ->
   IO ([CallRetrieError], WorkspaceEdit)
 callRetrie state session rewrites origin restrictToOriginatingFile = do
-  knownFiles <- readVar $ knownFilesVar $ shakeExtras state
+  knownFiles <- toKnownFiles . unhashed <$> readVar (knownTargetsVar $ shakeExtras state)
   print knownFiles
   let reuseParsedModule f = do
         pm <-
@@ -387,7 +387,7 @@ callRetrie state session rewrites origin restrictToOriginatingFile = do
         ,Retrie.targetFiles = map fromNormalizedFilePath $
             if restrictToOriginatingFile
                 then [origin]
-                else Set.toList $ unhashed knownFiles
+                else Set.toList knownFiles
         }
 
       (theImports, theRewrites) = partitionEithers rewrites

src/Ide/Main.hs

@@ -18,9 +18,9 @@ module Ide.Main(defaultMain, runLspMode) where
 import Control.Concurrent.Extra
 import Control.Monad.Extra
 import Data.Default
-import qualified Data.HashSet as HashSet
 import Data.List.Extra
 import qualified Data.Map.Strict as Map
+import qualified Data.HashMap.Strict as HashMap
 import Data.Maybe
 import qualified Data.Text as T
 import qualified Data.Text.IO as T
@@ -170,7 +170,7 @@ runLspMode lspArgs@LspArguments{..} idePlugins = do
         ide <- initialise def mainRule (pure $ IdInt 0) (showEvent lock) dummyWithProg (const (const id)) (logger Info)     debouncer (defaultIdeOptions sessionLoader) vfs
 
         putStrLn "\nStep 4/4: Type checking the files"
-        setFilesOfInterest ide $ HashSet.fromList $ map toNormalizedFilePath' files
+        setFilesOfInterest ide $ HashMap.fromList $ map ((, OnDisk) . toNormalizedFilePath') files
         results <- runAction "User TypeCheck" ide $ uses TypeCheck (map toNormalizedFilePath' files)
         let (worked, failed) = partition fst $ zip (map isJust results) files
         when (failed /= []) $

stack-8.6.4.yaml

@@ -33,12 +33,12 @@ extra-deps:
 - haddock-library-1.8.0
 - haskell-lsp-0.22.0.0
 - haskell-lsp-types-0.22.0.0
-- hie-bios-0.6.1
+- hie-bios-0.7.1
 - HsYAML-0.2.1.0@rev:1
 - HsYAML-aeson-0.2.0.0@rev:2
 - indexed-profunctors-0.1
 - lens-4.18
-- lsp-test-0.11.0.4
+- lsp-test-0.11.0.5
 - monad-dijkstra-0.1.1.2
 - opentelemetry-0.4.2
 - optics-core-0.2

stack-8.6.5.yaml

@@ -32,12 +32,12 @@ extra-deps:
 - haddock-library-1.8.0
 - haskell-lsp-0.22.0.0
 - haskell-lsp-types-0.22.0.0
-- hie-bios-0.6.1
+- hie-bios-0.7.1
 - HsYAML-0.2.1.0@rev:1
 - HsYAML-aeson-0.2.0.0@rev:2
 - indexed-profunctors-0.1
 - lens-4.18
-- lsp-test-0.11.0.4
+- lsp-test-0.11.0.5
 - monad-dijkstra-0.1.1.2
 - opentelemetry-0.4.2
 - optics-core-0.2

stack-8.8.2.yaml

@@ -28,14 +28,14 @@ extra-deps:
 - haskell-lsp-0.22.0.0
 - haskell-lsp-types-0.22.0.0
 - haskell-src-exts-1.21.1
-- hie-bios-0.6.1
+- hie-bios-0.7.1
 - hlint-2.2.8
 - hoogle-5.0.17.11
 - hsimport-0.11.0
 - HsYAML-0.2.1.0@rev:1
 - HsYAML-aeson-0.2.0.0@rev:2
 - ilist-0.3.1.0
-- lsp-test-0.11.0.4
+- lsp-test-0.11.0.5
 - monad-dijkstra-0.1.1.2
 - opentelemetry-0.4.2
 - ormolu-0.1.2.0

stack-8.8.3.yaml

@@ -22,13 +22,13 @@ extra-deps:
 - fourmolu-0.1.0.0@rev:1
 # - ghcide-0.1.0
 - haskell-src-exts-1.21.1
-- hie-bios-0.6.1
+- hie-bios-0.7.1
 - hlint-2.2.8
 - HsYAML-aeson-0.2.0.0@rev:2
 - hoogle-5.0.17.11
 - hsimport-0.11.0
 - ilist-0.3.1.0
-- lsp-test-0.11.0.4
+- lsp-test-0.11.0.5
 - monad-dijkstra-0.1.1.2
 - refinery-0.1.0.0
 - retrie-0.1.1.1

stack-8.8.4.yaml

@@ -24,13 +24,13 @@ extra-deps:
 - fourmolu-0.1.0.0@rev:1
 # - ghcide-0.1.0
 - haskell-src-exts-1.21.1
-- hie-bios-0.6.1
+- hie-bios-0.7.1
 - hlint-2.2.8
 - HsYAML-aeson-0.2.0.0@rev:2
 - hoogle-5.0.17.11
 - hsimport-0.11.0
 - ilist-0.3.1.0
-- lsp-test-0.11.0.4
+- lsp-test-0.11.0.5
 - monad-dijkstra-0.1.1.2
 - refinery-0.1.0.0
 - retrie-0.1.1.1

stack.yaml

@@ -27,15 +27,12 @@ extra-deps:
 - haddock-library-1.8.0
 - haskell-lsp-0.22.0.0
 - haskell-lsp-types-0.22.0.0
-- haskell-src-exts-1.21.1
-- hie-bios-0.6.1
-- hlint-2.2.8
-- hoogle-5.0.17.11
-- hsimport-0.11.0
+- hie-bios-0.7.1
 - HsYAML-0.2.1.0@rev:1
 - HsYAML-aeson-0.2.0.0@rev:2
-- ilist-0.3.1.0
-- lsp-test-0.11.0.4
+- indexed-profunctors-0.1
+- lens-4.18
+- lsp-test-0.11.0.5
 - monad-dijkstra-0.1.1.2
 - opentelemetry-0.4.2
 - ormolu-0.1.2.0