Sync file system and language server after restore #4020
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hubertp
force-pushed
the
wip/hubert/restore-vcs-184097084
branch
3 times, most recently
from
0908c1c
to
fb1a450
Compare
4e6
approved these changes
Jan 4, 2023
hubertp
force-pushed
the
wip/hubert/restore-vcs-184097084
branch
2 times, most recently
from
4437c81
to
8cf137d
Compare
VCS restore operation was correctly restoring the state of projects to the requested commit. Unfortunately, after the operation file system was becoming out-of-sync with language server's buffers (and IDE's content versions). A few important changes are introduced here that complicate the interaction between components: 1) vcs restore returns an actual diff between the current state and the requested commit 2) the response is forwarded buffer registry first rather than to the client 3) the diff is used to identify appropriate collaborative editors and notify them about the need to reload buffers from file system 4) all clients of affected open buffers are notified of the change via `text/didChange` notification 5) only then the client is notified about a successful restore operation
`vcs/restore` may remove files if they have been added after the commit. An clients with an open buffer for such files will be notified via `file/event`.
hubertp
force-pushed
the
wip/hubert/restore-vcs-184097084
branch
from
8cf137d
to
47607e3
Compare
Making tests deal with temporary flakiness/delays in forwardign messages between actors.
hubertp
force-pushed
the
wip/hubert/restore-vcs-184097084
branch
from
47607e3
to
b14b4cc
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request Description
VCS restore operation was correctly restoring the state of projects to the requested commit. Unfortunately, after the operation file system was becoming out-of-sync with language server's buffers (and IDE's content versions).
A few important changes are introduced here that complicate the interaction between components:
vcs restorereturns an actual diff between the current state and therequested commit
notify them about the need to reload buffers from file system
text/didChangenotification. If a file was removed and there were open buffers for it, clients will be notified viafile/eventand editor will be stoppedThis PR addresses one of the two problems reported in https://www.pivotaltracker.com/story/show/184097084.
Important Notes
We need to make sure that IDE correctly responds to
text/didChangenotifications.Checklist
Please include the following checklist in your PR:
Scala,
Java,
and
Rust
style guides.
./run ide buildand./run ide watch.