Skip to content

Avoid creating IsFileOfInterest keys for non workspace files #1661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 6, 2021
Merged

Avoid creating IsFileOfInterest keys for non workspace files #1661

Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3d7195d
Avoid creating IsFileOfInterest keys for non workspace files
pepeiborra Mar 27, 2021
bf61949
Only add the IsFileOfInterest dependency when needed
pepeiborra Apr 4, 2021
035edc8
Clarify logic
pepeiborra Apr 5, 2021
3d3f36b
fixup! Clarify logic
pepeiborra Apr 5, 2021
c59f8a0
Merge branch 'master' into avoid-isFileOfInterest
pepeiborra Apr 5, 2021
b651043
Merge branch 'master' into avoid-isFileOfInterest
mergify[bot] Apr 5, 2021
d8145ed
Merge branch 'master' into avoid-isFileOfInterest
jneira Apr 6, 2021
38dc9de
Merge branch 'master' into avoid-isFileOfInterest
mergify[bot] Apr 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions ghcide/src/Development/IDE/Core/FileStore.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ import qualified Development.IDE.Types.Logger as L

import qualified Data.Binary as B
import qualified Data.ByteString.Lazy as LBS
import Development.IDE.Core.IdeConfiguration (isWorkspaceFile)
import Language.LSP.Server hiding
(getVirtualFile)
import qualified Language.LSP.Server as LSP
Expand Down Expand Up @@ -127,16 +128,23 @@ getModificationTimeImpl vfs isWatched missingFileDiags file = do
let file' = fromNormalizedFilePath file
let wrap time@(l,s) = (Just $ LBS.toStrict $ B.encode time, ([], Just $ ModificationTime l s))
mbVirtual <- liftIO $ getVirtualFile vfs $ filePathToUri' file
-- we use 'getVirtualFile' to discriminate FOIs so make that
-- dependency explicit by using the IsFileOfInterest rule
_ <- use_ IsFileOfInterest file
case mbVirtual of
Just (virtualFileVersion -> ver) -> do
alwaysRerun
pure (Just $ LBS.toStrict $ B.encode ver, ([], Just $ VFSVersion ver))
Nothing -> do
isWF <- isWatched file
unless (isWF || isInterface file) alwaysRerun
if isWF
then -- the file is watched so we can rely on FileWatched notifications,
-- but also need a dependency on IsFileOfInterest to reinstall
-- alwaysRerun when the file becomes VFS
void (use_ IsFileOfInterest file)
else if isInterface file
then -- interface files are tracked specially using the closed world assumption
pure ()
else -- in all other cases we will need to freshly check the file system
alwaysRerun

liftIO $ fmap wrap (getModTime file')
`catch` \(e :: IOException) -> do
let err | isDoesNotExistError e = "File does not exist: " ++ file'
Expand Down