Merge branch 'master' into jhrcek/refactor-plugin-fix-regex-extracting-import-suggestions

Author: jhrcek

ghcide/ghcide.cabal

@@ -87,7 +87,7 @@ library
     , hashable
     , hie-bios                     ==0.13.1
     , hie-compat                   ^>=0.3.0.0
-    , hiedb                        ^>= 0.5.0.1
+    , hiedb                        ^>= 0.6.0.0
     , hls-graph                    == 2.6.0.0
     , hls-plugin-api               == 2.6.0.0
     , implicit-hie                 >= 0.1.4.0 && < 0.1.5

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

@@ -1116,16 +1116,16 @@ getLinkableRule recorder =
     HiFileResult{hirModIface, hirModDetails, hirCoreFp} <- use_ GetModIface f
     let obj_file  = ml_obj_file (ms_location ms)
         core_file = ml_core_file (ms_location ms)
-    -- Can't use `GetModificationTime` rule because the core file was possibly written in this
-    -- very session, so the results aren't reliable
-    core_t <- liftIO $ getModTime core_file
     case hirCoreFp of
-      Nothing -> error "called GetLinkable for a file without a linkable"
+      Nothing -> error $ "called GetLinkable for a file without a linkable: " ++ show f
       Just (bin_core, fileHash) -> do
         session <- use_ GhcSessionDeps f
         linkableType <- getLinkableType f >>= \case
-          Nothing -> error "called GetLinkable for a file which doesn't need compilation"
+          Nothing -> error $ "called GetLinkable for a file which doesn't need compilation: " ++ show f
           Just t -> pure t
+        -- Can't use `GetModificationTime` rule because the core file was possibly written in this
+        -- very session, so the results aren't reliable
+        core_t <- liftIO $ getModTime core_file
         (warns, hmi) <- case linkableType of
           -- Bytecode needs to be regenerated from the core file
           BCOLinkable -> liftIO $ coreFileToLinkable linkableType (hscEnv session) ms hirModIface hirModDetails bin_core (posixSecondsToUTCTime core_t)

haskell-language-server.cabal

@@ -305,7 +305,7 @@ library hls-call-hierarchy-plugin
     , containers
     , extra
     , ghcide                == 2.6.0.0
-    , hiedb
+    , hiedb                 ^>= 0.6.0.0
     , hls-plugin-api        == 2.6.0.0
     , lens
     , lsp                    >=2.4
@@ -488,7 +488,7 @@ library hls-rename-plugin
     , containers
     , ghcide                == 2.6.0.0
     , hashable
-    , hiedb
+    , hiedb                 ^>= 0.6.0.0
     , hie-compat
     , hls-plugin-api        == 2.6.0.0
     , haskell-language-server:hls-refactor-plugin

stack-lts21.yaml

@@ -18,7 +18,7 @@ allow-newer: true
 
 extra-deps:
 - floskell-0.11.1
-- hiedb-0.5.0.1
+- hiedb-0.6.0.0
 - hie-bios-0.13.1
 - implicit-hie-0.1.4.0
 - monad-dijkstra-0.1.1.3

stack.yaml

@@ -18,7 +18,7 @@ allow-newer: true
 extra-deps:
 - floskell-0.11.1
 - retrie-1.2.2
-- hiedb-0.5.0.1
+- hiedb-0.6.0.0
 - implicit-hie-0.1.4.0
 - lsp-2.4.0.0
 - lsp-test-0.17.0.0