Merge pull request #1 from wz1000/master

Fix issue with caching module

Author: dpren

Makefile

@@ -18,6 +18,12 @@ hie-8.2.2:
 		&& cp ~/.local/bin/hie-8.2.2 ~/.local/bin/hie-8.2
 .PHONY: hie-8.2.2
 
+test:
+	stack --stack-yaml=stack-8.0.2.yaml test    \
+	&& stack --stack-yaml=stack-8.2.1.yaml test \
+	&& stack --stack-yaml=stack.yaml test
+.PHONY: test
+
 build-copy-compiler-tool:
 	stack --stack-yaml=stack-8.0.2.yaml build --copy-compiler-tool    \
 	&& stack --stack-yaml=stack-8.2.1.yaml build --copy-compiler-tool \

hie-plugin-api/Haskell/Ide/Engine/ModuleCache.hs

@@ -130,6 +130,21 @@ withCachedModuleAndData uri noCache callback = do
 cacheModule :: (Monad m, GM.MonadIO m, HasGhcModuleCache m)
             => FilePath -> CachedModule -> m ()
 cacheModule uri cm = do
+  uri' <- liftIO $ canonicalizePath uri
+  modifyCache (\gmc ->
+      gmc { uriCaches = Map.insert
+                          uri'
+                          (UriCache cm Map.empty)
+                          (uriCaches gmc)
+          }
+    )
+  where
+
+-- | Saves a module to the cache without clearing the associated cache data - use only if you are
+-- sure that the cached data associated with the module doesn't change
+cacheModuleNoClear :: (Monad m, GM.MonadIO m, HasGhcModuleCache m)
+            => FilePath -> CachedModule -> m ()
+cacheModuleNoClear uri cm = do
   uri' <- liftIO $ canonicalizePath uri
   modifyCache (\gmc ->
       gmc { uriCaches = Map.insertWith

src/Haskell/Ide/Engine/Transport/LspStdio.hs

@@ -257,7 +257,7 @@ updatePositionMap uri changes = pluginGetFile "updatePositionMap: " uri $ \file
             (n2o' <=< newToOld r txt, oldToNew r txt <=< o2n')
           go _ _ = (const Nothing, const Nothing)
       let cm' = cm {newPosToOld = n2o, oldPosToNew = o2n}
-      cacheModule file cm'
+      cacheModuleNoClear file cm'
       return $ IdeResponseOk ()
     Nothing ->
       return $ IdeResponseOk ()