lsp: Address empty module issues on rename #1078
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
charlieegan3
commented
Sep 9, 2024
| @@ -747,6 +747,8 @@ func (l *LanguageServer) StartTemplateWorker(ctx context.Context) { | |||
| newContents, err := l.templateContentsForFile(evt.URI) | |||
| if err != nil { | |||
| l.logError(fmt.Errorf("failed to template new file: %w", err)) | |||
|
|
|||
| continue | |||
There was a problem hiding this comment.
This is not the fix, but when there is an error in templating we should skip the rest.
charlieegan3
commented
Sep 9, 2024
| @@ -790,6 +792,14 @@ func (l *LanguageServer) templateContentsForFile(fileURI string) (string, error) | |||
| return "", errors.New("file already has contents, templating not allowed") | |||
| } | |||
|
|
|||
| diskContent, err := os.ReadFile(uri.ToPath(l.clientIdentifier, fileURI)) | |||
There was a problem hiding this comment.
this is also not the fix but is an additional guard for templating over files that have contents on disk already.
There was a problem hiding this comment.
Any added safeguards are good 👍
charlieegan3
commented
Sep 9, 2024
| ) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to update cache for uri %q: %w", renameOp.NewURI, err) | ||
| content, ok := l.cache.GetFileContents(renameOp.OldURI) |
There was a problem hiding this comment.
This is the fix for the empty module issue, were we load from the cache first, and only load from disk if it's missing or empty in the cache
charlieegan3
force-pushed
the
template-fun
branch
2 times, most recently
from
0f5cacb to
d241bbf
Compare
anderseknert
approved these changes
Sep 9, 2024
| @@ -790,6 +792,14 @@ func (l *LanguageServer) templateContentsForFile(fileURI string) (string, error) | |||
| return "", errors.New("file already has contents, templating not allowed") | |||
| } | |||
|
|
|||
| diskContent, err := os.ReadFile(uri.ToPath(l.clientIdentifier, fileURI)) | |||
There was a problem hiding this comment.
Any added safeguards are good 👍
| ) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to update cache for uri %q: %w", renameOp.NewURI, err) | ||
| content, ok := l.cache.GetFileContents(renameOp.OldURI) |
charlieegan3
force-pushed
the
template-fun
branch
from
d241bbf to
126d5a6
Compare
charlieegan3
force-pushed
the
template-fun
branch
from
126d5a6 to
c0bef96
Compare
srenatus
pushed a commit
to srenatus/regal
that referenced
this pull request
Oct 1, 2024
* WIP * Use cache contents before disk
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.
This PR makes changes to where the contents of files come from when being moved. Previously, preference was given to the contents on disk. This turned out to be incorrect as the files on disk are often empty until saved.
I found that I was able to replicate one of the empty module problems by:
before
Screen.Recording.2024-09-09.at.10.32.12.mov
after
Screen.Recording.2024-09-09.at.10.34.16.mov