Use a workspace level TokenMap and Engines
#7139
Merged
Conversation
This file contains hidden or 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
JoshuaBatty
added
language server
CodSpeed Performance ReportMerging #7139 will not alter performanceComparing Summary
Benchmarks breakdown
|
8 tasks
IGI-111
pushed a commit
that referenced
this pull request
May 5, 2025
## Description This PR replaces our custom Tokio-based thread watcher for `Forc.toml` files with the built-in LSP `didChangeWatchedFiles` notification system. The changes: * Remove the Tokio thread-based file watching system and associated cleanup code * Implement client-side file watching registration during initialization * Handle `Forc.toml` file changes through the LSP notification protocol * Update tests to use the new notification system * Simplify manifest syncing with a direct approach This approach is more efficient as it leverages the client's native file watching capabilities rather than spawning a separate thread. The PR maintains the same functionality while reducing resource usage and complexity. Note: This doesn't yet implement the recompilation on `Forc.toml` changes as mentioned in issue #7103, but adds a TODO placeholder for that functionality. This PR is a precursor to #7139 ## Checklist - [x] I have linked to any relevant issues. - [x] I have commented my code, particularly in hard-to-understand areas. - [ ] I have updated the documentation where relevant (API docs, the reference, and the Sway book). - [ ] If my change requires substantial documentation changes, I have [requested support from the DevRel team](https://github.com/FuelLabs/devrel-requests/issues/new/choose) - [x] I have added tests that prove my fix is effective or that my feature works. - [x] I have added (or requested a maintainer to add) the necessary `Breaking*` or `New Feature` labels where relevant. - [x] I have done my best to ensure that my PR adheres to [the Fuel Labs Code Review Standards](https://github.com/FuelLabs/rfcs/blob/master/text/code-standards/external-contributors.md). - [x] I have requested a review from the relevant team or maintainers.
8 tasks
JoshuaBatty
added a commit
that referenced
this pull request
May 19, 2025
## Description * Moves `SyncWorkspace` ownership from individual `Session` instances to a single, global instance within `ServerState`. * `SyncWorkspace` is now initialized once when the LSP server starts, creating a single temporary workspace clone. Also removes the `resync` function. This was causing the server and the IDE to fall out of sync with each other. For example, if you have 2 panels open and then save a file in one of the tabs but have unsaved changes in the other tab then those changes would not be reflected in the temp memory folder. This meant everything would be out of sync. We already are syncing everything on each keystroke per file so this fn was not necessary in the first place. This PR is a precursor to #7139 part of #7111 ## Checklist - [x] I have linked to any relevant issues. - [x] I have commented my code, particularly in hard-to-understand areas. - [ ] I have updated the documentation where relevant (API docs, the reference, and the Sway book). - [ ] If my change requires substantial documentation changes, I have [requested support from the DevRel team](https://github.com/FuelLabs/devrel-requests/issues/new/choose) - [x] I have added tests that prove my fix is effective or that my feature works. - [x] I have added (or requested a maintainer to add) the necessary `Breaking*` or `New Feature` labels where relevant. - [x] I have done my best to ensure that my PR adheres to [the Fuel Labs Code Review Standards](https://github.com/FuelLabs/rfcs/blob/master/text/code-standards/external-contributors.md). - [x] I have requested a review from the relevant team or maintainers. --------- Co-authored-by: zees-dev <[email protected]>
JoshuaBatty
force-pushed
the
josh/token_map
branch
from
c6dc4e5 to
2742a4c
Compare
…ter and update related code accordingly.
sdankel
approved these changes
May 20, 2025
kayagokalp
approved these changes
May 20, 2025
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.
Description
This PR moves
TokenMapandEnginesout of theSessiontype up toServerStateso a single instance of each can be shared across all workspace members.Up until now, each workspace member used a unique
Engines. This meant the standard library and any other dependancies were unable to utilise theQueryEnginecache, leading to lots of duplicate entries. This was leading to inflated initialization times when opening a new workspace member and significantly increasing the RAM footprint of the language server.For example, opening each workspace member in the FUSD projects workspace would see RAM usage exceeding ~30.0 gig. Now we no longer exceed 2.0 gig of RAM.
Future PR's will move the
BuildPlanCacheup to theServerStatelevel as well.part of #7111 & #6226
closes #5645
closes #5856
Checklist
Breaking*orNew Featurelabels where relevant.