Merge pull request #530 from jneira/ghcide-master

Use ghcide master head (d76fbf9) with the new handling of template haskell
haskell · Nov 3, 2020 · d0f02b5 · d0f02b5
2 parents 6c14163 + e1a5752
commit d0f02b5
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 19 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -69,7 +69,7 @@ defaults: &defaults
         # work ok, but given that these CircleCI runners aren't the beefiest
         # machine can cause some flakiness. So pass -j1 to Tasty (NOT Stack) to
         # tell it to go slow and steady.
-        command: stack --stack-yaml=${STACK_FILE} test haskell-language-server --dump-logs --test-arguments="-j1"
+        command: stack --stack-yaml=${STACK_FILE} test haskell-language-server --dump-logs --test-arguments="-j1 --rerun-update" || stack --stack-yaml=${STACK_FILE} test haskell-language-server --dump-logs --test-arguments="-j1 --rerun" || stack --stack-yaml=${STACK_FILE} test haskell-language-server --dump-logs --test-arguments="-j1 --rerun"
         no_output_timeout: 120m
 
     - run:

diff --git a/cabal.project b/cabal.project
@@ -1,7 +1,8 @@
 packages:
          ./
-         ghcide
-         hls-plugin-api
+         ./ghcide/hie-compat
+         ./ghcide
+         ./hls-plugin-api
          ./plugins/tactics
          ./plugins/hls-hlint-plugin
 

diff --git a/ghcide b/ghcide
diff --git a/plugins/default/src/Ide/Plugin/Eval.hs b/plugins/default/src/Ide/Plugin/Eval.hs
@@ -172,7 +172,7 @@ runEvalCmd lsp state EvalParams {..} = withIndefiniteProgress lsp "Eval" Cancell
   session <-
     liftIO $
       runAction "runEvalCmd.ghcSession" state $
-        use_ GhcSessionDeps $
+        use_ GhcSession $
           toNormalizedFilePath' $
             fp
 

diff --git a/plugins/default/src/Ide/Plugin/ImportLens.hs b/plugins/default/src/Ide/Plugin/ImportLens.hs
@@ -192,11 +192,11 @@ extractMinimalImports ::
   Maybe (HscEnvEq) ->
   Maybe (TcModuleResult) ->
   IO ([LImportDecl GhcRn], Maybe [LImportDecl GhcRn])
-extractMinimalImports (Just (hsc)) (Just (tmrModule -> TypecheckedModule {..})) = do
+extractMinimalImports (Just (hsc)) (Just (TcModuleResult {..})) = do
   -- extract the original imports and the typechecking environment
-  let (tcEnv, _) = tm_internals_
-      Just (_, imports, _, _) = tm_renamed_source
-      ParsedModule {pm_parsed_source = L loc _} = tm_parsed_module
+  let tcEnv = tmrTypechecked
+      (_, imports, _, _) = tmrRenamed
+      ParsedModule {pm_parsed_source = L loc _} = tmrParsed
       span = fromMaybe (error "expected real") $ realSpan loc
 
   -- GHC is secretly full of mutable state

diff --git a/plugins/default/src/Ide/Plugin/Retrie.hs b/plugins/default/src/Ide/Plugin/Retrie.hs
@@ -53,15 +53,14 @@ import           Development.IDE.GHC.Compat     (GenLocated (L), GhcRn,
                                                  RuleDecls (HsRules),
                                                  SrcSpan (..),
                                                  TyClDecl (SynDecl),
-                                                 TyClGroup (..),
-                                                 TypecheckedModule (..), fun_id,
+                                                 TyClGroup (..), fun_id,
                                                  mi_fixities, moduleNameString,
                                                  parseModule, rds_rules,
                                                  srcSpanFile)
 import           GHC.Generics                   (Generic)
 import           GhcPlugins                     (Outputable,
                                                  SourceText (NoSourceText),
-                                                 isQual, isQual_maybe,
+                                                 hm_iface, isQual, isQual_maybe,
                                                  nameModule_maybe, nameRdrName,
                                                  occNameFS, occNameString,
                                                  rdrNameOcc, unpackFS)
@@ -213,7 +212,7 @@ getBinds nfp = runMaybeT $ do
   -- we use the typechecked source instead of the parsed source
   -- to be able to extract module names from the Ids,
   -- so that we can include adding the required imports in the retrie command
-  let TypecheckedModule {tm_renamed_source = Just rn} = tmrModule tm
+  let rn = tmrRenamed tm
       ( HsGroup
           { hs_valds =
               XValBindsLR
@@ -369,8 +368,8 @@ callRetrie state session rewrites origin restrictToOriginatingFile = do
                           Just (stringToStringBuffer contents)
                       }
               logPriority (ideLogger state) Info $ T.pack $ "Parsing module: " <> t
-              (_, parsed) <-
-                runGhcEnv session (parseModule ms')
+              parsed <-
+                evalGhcEnv session (parseModule ms')
                   `catch` \e -> throwIO (GHCParseError nt (show @SomeException e))
               (fixities, parsed) <- fixFixities f (fixAnns parsed)
               return (fixities, parsed)
@@ -454,9 +453,9 @@ callRetrie state session rewrites origin restrictToOriginatingFile = do
             let fs = occNameFS n
         ]
     fixFixities f pm = do
-      HiFileResult {hirModIface} <-
+      HiFileResult {hirHomeMod} <-
         useOrFail "GetModIface" NoTypeCheck GetModIface f
-      let fixities = fixityEnvFromModIface hirModIface
+      let fixities = fixityEnvFromModIface $ hm_iface hirHomeMod
       res <- transformA pm (fix fixities)
       return (fixities, res)
     fixAnns ParsedModule {..} =

diff --git a/plugins/tactics/src/Ide/Plugin/Tactic.hs b/plugins/tactics/src/Ide/Plugin/Tactic.hs
@@ -61,6 +61,7 @@ import           Language.Haskell.LSP.Types
 import           OccName
 import           SrcLoc (containsSpan)
 import           System.Timeout
+import           TcRnTypes (tcg_binds)
 
 
 descriptor :: PluginId -> PluginDescriptor
@@ -260,8 +261,8 @@ judgementForHole state nfp range = do
 
   resulting_range <- liftMaybe $ toCurrentRange amapping $ realSrcSpanToRange rss
   (tcmod, _) <- MaybeT $ runIde state $ useWithStale TypeCheck nfp
-  let tcg = fst $ tm_internals_ $ tmrModule tcmod
-      tcs = tm_typechecked_source $ tmrModule tcmod
+  let tcg  = tmrTypechecked tcmod
+      tcs = tcg_binds tcg
       ctx = mkContext
               (mapMaybe (sequenceA . (occName *** coerce))
                 $ getDefiningBindings binds rss)

diff --git a/stack-8.10.1.yaml b/stack-8.10.1.yaml
@@ -2,6 +2,7 @@ resolver: nightly-2020-08-16 # Last 8.10.1
 
 packages:
 - .
+- ./ghcide/hie-compat
 - ./ghcide/
 - ./hls-plugin-api
 - ./plugins/tactics

diff --git a/stack-8.10.2.yaml b/stack-8.10.2.yaml
@@ -2,6 +2,7 @@ resolver: nightly-2020-10-19
 
 packages:
 - .
+- ./ghcide/hie-compat
 - ./ghcide/
 - ./hls-plugin-api
 - ./plugins/tactics

diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml
@@ -3,6 +3,7 @@ compiler: ghc-8.6.4
 
 packages:
 - .
+- ./ghcide/hie-compat
 - ./ghcide/
 - ./hls-plugin-api
 - ./plugins/tactics

diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml
@@ -2,6 +2,7 @@ resolver: lts-14.27 # Last 8.6.5
 
 packages:
 - .
+- ./ghcide/hie-compat
 - ./ghcide/
 - ./hls-plugin-api
 - ./plugins/tactics

diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml
@@ -2,6 +2,7 @@ resolver: lts-15.3 # Last 8.8.2
 
 packages:
 - .
+- ./ghcide/hie-compat
 - ./ghcide/
 - ./hls-plugin-api
 - ./plugins/tactics

diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml
@@ -2,6 +2,7 @@ resolver: lts-16.11 # Last 8.8.3
 
 packages:
 - .
+- ./ghcide/hie-compat
 - ./ghcide/
 - ./hls-plugin-api
 - ./plugins/tactics

diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml
@@ -2,6 +2,7 @@ resolver: lts-16.19
 
 packages:
 - .
+- ./ghcide/hie-compat
 - ./ghcide/
 - ./hls-plugin-api
 - ./plugins/tactics

diff --git a/stack.yaml b/stack.yaml
@@ -2,6 +2,7 @@ resolver: lts-14.27 # Last 8.6.5
 
 packages:
 - .
+- ./ghcide/hie-compat
 - ./ghcide/
 - ./hls-plugin-api
 - ./plugins/tactics