Merge pull request #1295 from wz1000/master

Fix file mapping state when we have a parsed module but not a typechecked module
haskell · Jun 17, 2019 · ad0d21f · ad0d21f
2 parents cd761a4 + ddb5b90
commit ad0d21f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/hie-plugin-api/Haskell/Ide/Engine/ModuleCache.hs b/hie-plugin-api/Haskell/Ide/Engine/ModuleCache.hs
@@ -225,7 +225,11 @@ cacheModule uri modul = do
         let defInfo = CachedInfo mempty mempty mempty mempty rfm return return
         return $ case muc of
           Just (UriCacheSuccess uc) ->
-            let newCI = (cachedInfo uc) { revMap = rfm }
+            let newCI = oldCI { revMap = rfm . revMap oldCI }
+                    --                         ^^^^^^^^^^^^
+                    -- We have to retain the old mapping state, since the
+                    -- old TypecheckedModule still contains spans relative to that
+                oldCI = cachedInfo uc
               in uc { cachedPsMod = pm, cachedInfo = newCI }
           _ -> UriCache defInfo pm Nothing mempty