rename and avoid resetting FOIs

haskell · Mar 5, 2021 · 2b6338e · 2b6338e
1 parent 4b56260
commit 2b6338e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/ghcide/src/Development/IDE/Core/FileStore.hs b/ghcide/src/Development/IDE/Core/FileStore.hs
@@ -15,7 +15,7 @@ module Development.IDE.Core.FileStore(
     makeVFSHandle,
     makeLSPVFSHandle,
     isFileOfInterestRule
-    ,modifyFileStore) where
+    ,resetFileStore) where
 
 import           Control.Concurrent.Extra
 import           Control.Concurrent.STM                       (atomically)
@@ -31,7 +31,7 @@ import           Data.Maybe
 import qualified Data.Rope.UTF16                              as Rope
 import qualified Data.Text                                    as T
 import           Data.Time
-import           Development.IDE.Core.OfInterest              (getFilesOfInterest)
+import           Development.IDE.Core.OfInterest              (getFilesOfInterest, OfInterestVar(..))
 import           Development.IDE.Core.RuleTypes
 import           Development.IDE.Core.Shake
 import           Development.IDE.GHC.Orphans                  ()
@@ -65,7 +65,7 @@ import           Language.LSP.Server                          hiding
 import qualified Language.LSP.Server                          as LSP
 import           Language.LSP.Types                           (FileChangeType (FcChanged),
                                                                FileEvent (FileEvent),
-                                                               uriToFilePath)
+                                                               uriToFilePath, toNormalizedFilePath)
 import           Language.LSP.VFS
 
 makeVFSHandle :: IO VFSHandle
@@ -119,15 +119,20 @@ getModificationTimeRule vfs isWatched =
                             else return (Nothing, ([diag], Nothing))
 
 -- | Reset the GetModificationTime state of watched files
-modifyFileStore :: IdeState -> [FileEvent] -> IO ()
-modifyFileStore state changes = mask $ \_ ->
+resetFileStore :: IdeState -> [FileEvent] -> IO ()
+resetFileStore ideState changes = mask $ \_ ->
     forM_ changes $ \(FileEvent uri c) ->
         case c of
             FcChanged
               | Just f <- uriToFilePath uri
               -> do
-                  deleteValue state (GetModificationTime_ True) (toNormalizedFilePath' f)
-                  deleteValue state (GetModificationTime_ False) (toNormalizedFilePath' f)
+                  -- we record FOIs document versions in all the stored values
+                  -- so NEVER reset FOIs to avoid losing their versions
+                  OfInterestVar foisVar <- getIdeGlobalExtras (shakeExtras ideState)
+                  fois <- readVar foisVar
+                  unless (HM.member (toNormalizedFilePath f) fois) $ do
+                    deleteValue ideState (GetModificationTime_ True) (toNormalizedFilePath' f)
+                    deleteValue ideState (GetModificationTime_ False) (toNormalizedFilePath' f)
             _ -> pure ()
 
 -- Dir.getModificationTime is surprisingly slow since it performs

diff --git a/ghcide/src/Development/IDE/Core/OfInterest.hs b/ghcide/src/Development/IDE/Core/OfInterest.hs
@@ -9,7 +9,8 @@
 module Development.IDE.Core.OfInterest(
     ofInterestRules,
     getFilesOfInterest, setFilesOfInterest, modifyFilesOfInterest,
-    kick, FileOfInterestStatus(..)
+    kick, FileOfInterestStatus(..),
+    OfInterestVar(..)
     ) where
 
 import           Control.Concurrent.Extra

diff --git a/ghcide/src/Development/IDE/LSP/Notifications.hs b/ghcide/src/Development/IDE/LSP/Notifications.hs
@@ -31,7 +31,7 @@ import qualified Data.Text                             as Text
 import           Control.Monad.IO.Class
 import           Development.IDE.Core.FileExists       (modifyFileExists,
                                                         watchedGlobs)
-import           Development.IDE.Core.FileStore        (modifyFileStore,
+import           Development.IDE.Core.FileStore        (resetFileStore,
                                                         setFileModified,
                                                         setSomethingModified,
                                                         typecheckParents)
@@ -85,7 +85,7 @@ setHandlersNotifications = mconcat
         let msg = Text.pack $ show fileEvents
         logDebug (ideLogger ide) $ "Watched file events: " <> msg
         modifyFileExists ide fileEvents
-        modifyFileStore ide fileEvents
+        resetFileStore ide fileEvents
         setSomethingModified ide
 
   , notificationHandler LSP.SWorkspaceDidChangeWorkspaceFolders $