Track file versions accurately

Author: wz1000

cabal-ghc90.project

@@ -28,6 +28,24 @@ packages:
          ./plugins/hls-alternate-number-format-plugin
          ./plugins/hls-selection-range-plugin
 
+source-repository-package
+  type: git
+  location: https://github.com/haskell/lsp
+  tag: 63de2845c2dd6d33568696f8652b8fd65fae6b72
+  subdir: lsp
+
+source-repository-package
+  type: git
+  location: https://github.com/haskell/lsp
+  tag: 63de2845c2dd6d33568696f8652b8fd65fae6b72
+  subdir: lsp-types
+
+source-repository-package
+  type: git
+  location: https://github.com/haskell/lsp
+  tag: 63de2845c2dd6d33568696f8652b8fd65fae6b72
+  subdir: lsp-test
+
 tests: true
 
 package *

cabal-ghc921.project

@@ -28,6 +28,24 @@ packages:
          ./plugins/hls-alternate-number-format-plugin
          ./plugins/hls-selection-range-plugin
 
+source-repository-package
+  type: git
+  location: https://github.com/haskell/lsp
+  tag: 63de2845c2dd6d33568696f8652b8fd65fae6b72
+  subdir: lsp
+
+source-repository-package
+  type: git
+  location: https://github.com/haskell/lsp
+  tag: 63de2845c2dd6d33568696f8652b8fd65fae6b72
+  subdir: lsp-types
+
+source-repository-package
+  type: git
+  location: https://github.com/haskell/lsp
+  tag: 63de2845c2dd6d33568696f8652b8fd65fae6b72
+  subdir: lsp-test
+
 with-compiler: ghc-9.2.1
 
 tests: true

cabal.project

@@ -28,6 +28,25 @@ packages:
          ./plugins/hls-qualify-imported-names-plugin
          ./plugins/hls-selection-range-plugin
 
+
+source-repository-package
+  type: git
+  location: https://github.com/haskell/lsp
+  tag: 63de2845c2dd6d33568696f8652b8fd65fae6b72
+  subdir: lsp
+
+source-repository-package
+  type: git
+  location: https://github.com/haskell/lsp
+  tag: 63de2845c2dd6d33568696f8652b8fd65fae6b72
+  subdir: lsp-types
+
+source-repository-package
+  type: git
+  location: https://github.com/haskell/lsp
+  tag: 63de2845c2dd6d33568696f8652b8fd65fae6b72
+  subdir: lsp-test
+
 -- Standard location for temporary packages needed for particular environments
 -- For example it is used in the project gitlab mirror to help in the MAcOS M1 build script
 -- See https://github.com/haskell/haskell-language-server/blob/master/.gitlab-ci.yml

ghcide/ghcide.cabal

@@ -50,6 +50,7 @@ library
         dlist,
         exceptions,
         extra >= 1.7.4,
+        enummapset,
         fuzzy,
         filepath,
         fingertree,
@@ -64,8 +65,8 @@ library
         lens,
         list-t,
         hiedb == 0.4.1.*,
-        lsp-types ^>= 1.4.0.1,
-        lsp ^>= 1.4.0.0 ,
+        lsp-types ^>= 1.5.0.0,
+        lsp ^>= 1.5.0.0 ,
         monoid-subclasses,
         mtl,
         network-uri,
@@ -76,7 +77,7 @@ library
         random,
         regex-tdfa >= 1.3.1.0,
         retrie,
-        rope-utf16-splay,
+        text-rope,
         safe,
         safe-exceptions,
         hls-graph ^>= 1.6,
@@ -148,6 +149,7 @@ library
         Development.IDE.Main.HeapStats
         Development.IDE.Core.Debouncer
         Development.IDE.Core.FileStore
+        Development.IDE.Core.FileUtils
         Development.IDE.Core.IdeConfiguration
         Development.IDE.Core.OfInterest
         Development.IDE.Core.PositionMapping
@@ -394,7 +396,7 @@ test-suite ghcide-tests
         QuickCheck,
         quickcheck-instances,
         random,
-        rope-utf16-splay,
+        text-rope,
         regex-tdfa ^>= 1.3.1,
         safe,
         safe-exceptions,

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

@@ -157,8 +157,8 @@ allExtensions opts = [extIncBoot | ext <- optExtensions opts, extIncBoot <- [ext
 -- | Installs the 'getFileExists' rules.
 --   Provides a fast implementation if client supports dynamic watched files.
 --   Creates a global state as a side effect in that case.
-fileExistsRules :: Maybe (LanguageContextEnv Config) -> VFSHandle -> Rules ()
-fileExistsRules lspEnv vfs = do
+fileExistsRules :: Maybe (LanguageContextEnv Config) -> Rules ()
+fileExistsRules lspEnv = do
   supportsWatchedFiles <- case lspEnv of
     Nothing      -> pure False
     Just lspEnv' -> liftIO $  runLspT lspEnv' isWatchSupported
@@ -179,19 +179,19 @@ fileExistsRules lspEnv vfs = do
         else const $ pure False
 
   if supportsWatchedFiles
-    then fileExistsRulesFast isWatched vfs
-    else fileExistsRulesSlow vfs
+    then fileExistsRulesFast isWatched
+    else fileExistsRulesSlow
 
-  fileStoreRules vfs isWatched
+  fileStoreRules isWatched
 
 -- Requires an lsp client that provides WatchedFiles notifications, but assumes that this has already been checked.
-fileExistsRulesFast :: (NormalizedFilePath -> Action Bool) -> VFSHandle -> Rules ()
-fileExistsRulesFast isWatched vfs =
+fileExistsRulesFast :: (NormalizedFilePath -> Action Bool) -> Rules ()
+fileExistsRulesFast isWatched =
     defineEarlyCutoff $ RuleNoDiagnostics $ \GetFileExists file -> do
         isWF <- isWatched file
         if isWF
-            then fileExistsFast vfs file
-            else fileExistsSlow vfs file
+            then fileExistsFast file
+            else fileExistsSlow file
 
 {- Note [Invalidating file existence results]
 We have two mechanisms for getting file existence information:
@@ -209,8 +209,8 @@ For the VFS lookup, however, we won't get prompted to flush the result, so inste
 we use 'alwaysRerun'.
 -}
 
-fileExistsFast :: VFSHandle -> NormalizedFilePath -> Action (Maybe BS.ByteString, Maybe Bool)
-fileExistsFast vfs file = do
+fileExistsFast :: NormalizedFilePath -> Action (Maybe BS.ByteString, Maybe Bool)
+fileExistsFast file = do
     -- Could in principle use 'alwaysRerun' here, but it's too slwo, See Note [Invalidating file existence results]
     mp <- getFileExistsMapUntracked
 
@@ -219,28 +219,27 @@ fileExistsFast vfs file = do
       Just exist -> pure exist
       -- We don't know about it: use the slow route.
       -- Note that we do *not* call 'fileExistsSlow', as that would trigger 'alwaysRerun'.
-      Nothing    -> liftIO $ getFileExistsVFS vfs file
+      Nothing    -> getFileExistsVFS file
     pure (summarizeExists exist, Just exist)
 
 summarizeExists :: Bool -> Maybe BS.ByteString
 summarizeExists x = Just $ if x then BS.singleton 1 else BS.empty
 
-fileExistsRulesSlow :: VFSHandle -> Rules ()
-fileExistsRulesSlow vfs =
-  defineEarlyCutoff $ RuleNoDiagnostics $ \GetFileExists file -> fileExistsSlow vfs file
+fileExistsRulesSlow :: Rules ()
+fileExistsRulesSlow =
+  defineEarlyCutoff $ RuleNoDiagnostics $ \GetFileExists file -> fileExistsSlow file
 
-fileExistsSlow :: VFSHandle -> NormalizedFilePath -> Action (Maybe BS.ByteString, Maybe Bool)
-fileExistsSlow vfs file = do
+fileExistsSlow :: NormalizedFilePath -> Action (Maybe BS.ByteString, Maybe Bool)
+fileExistsSlow file = do
     -- See Note [Invalidating file existence results]
     alwaysRerun
-    exist <- liftIO $ getFileExistsVFS vfs file
+    exist <- getFileExistsVFS file
     pure (summarizeExists exist, Just exist)
 
-getFileExistsVFS :: VFSHandle -> NormalizedFilePath -> IO Bool
-getFileExistsVFS vfs file = do
-    -- we deliberately and intentionally wrap the file as an FilePath WITHOUT mkAbsolute
-    -- so that if the file doesn't exist, is on a shared drive that is unmounted etc we get a properly
-    -- cached 'No' rather than an exception in the wrong place
-    handle (\(_ :: IOException) -> return False) $
-        (isJust <$> getVirtualFile vfs (filePathToUri' file)) ||^
-        Dir.doesFileExist (fromNormalizedFilePath file)
+getFileExistsVFS :: NormalizedFilePath -> Action Bool
+getFileExistsVFS file = do
+  vf <- getVirtualFile file
+  if isJust vf
+  then pure True
+  else liftIO $ handle (\(_ :: IOException) -> return False) $
+         Dir.doesFileExist (fromNormalizedFilePath file)