lsp: Correct Path to URI encoding #1083
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
Spaces must be encoded as %20. This case causing the state worker to reload contents from disk as it appeared a file did not exist in the cache. Signed-off-by: Charlie Egan <[email protected]>
charlieegan3
commented
Sep 9, 2024
| @@ -211,18 +211,14 @@ func (l *LanguageServer) StartDiagnosticsWorker(ctx context.Context) { | |||
| case <-ctx.Done(): | |||
| return | |||
| case evt := <-l.diagnosticRequestFile: | |||
| success, err := l.processTextContentUpdate(ctx, evt.URI, evt.Content) | |||
| err := l.processTextContentUpdate(ctx, evt.URI, evt.Content) | |||
There was a problem hiding this comment.
This has been updated to avoid any special handling of parse errors. diagnostics are always sent from the parent now. This is unrelated to the title fix.
charlieegan3
commented
Sep 9, 2024
| @@ -936,33 +932,24 @@ func (l *LanguageServer) processTextContentUpdate( | |||
| ctx context.Context, | |||
There was a problem hiding this comment.
See note above, this function now just attempts to update the parse if the content changed.
charlieegan3
commented
Sep 9, 2024
| @@ -2132,7 +2119,7 @@ func (l *LanguageServer) loadWorkspaceContents(ctx context.Context, newOnly bool | |||
| } | |||
|
|
|||
| // if the caller has requested only new files, then we can exit early | |||
| if _, ok := l.cache.GetModule(fileURI); newOnly && ok { | |||
| if _, ok := l.cache.GetFileContents(fileURI); newOnly && ok { | |||
There was a problem hiding this comment.
The best proxy for 'Existence in the cache' is file contents and not a parsed module. This is related to the fix, but is in addition to the required change.
charlieegan3
commented
Sep 9, 2024
| @@ -19,6 +19,9 @@ func FromPath(client clients.Identifier, path string) string { | |||
| // Convert Windows path separators to Unix separators | |||
| path = filepath.ToSlash(path) | |||
|
|
|||
| // spaces must be percent-encoded | |||
| path = strings.ReplaceAll(path, " ", "%20") | |||
There was a problem hiding this comment.
This is the fix, going from paths to URIs when paths contained spaces was broken. This meant files were being reloaded from disk at incorrect times.
anderseknert
approved these changes
Sep 9, 2024
| @@ -19,6 +19,9 @@ func FromPath(client clients.Identifier, path string) string { | |||
| // Convert Windows path separators to Unix separators | |||
| path = filepath.ToSlash(path) | |||
|
|
|||
| // spaces must be percent-encoded | |||
| path = strings.ReplaceAll(path, " ", "%20") | |||
srenatus
pushed a commit
to srenatus/regal
that referenced
this pull request
Oct 1, 2024
Spaces must be encoded as %20. This case causing the state worker to reload contents from disk as it appeared a file did not exist in the cache. Signed-off-by: Charlie Egan <[email protected]>
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.
Spaces must be encoded as %20. This case causing the state worker to reload contents from disk as it appeared a file did not exist in the cache.