Ensure we don't send duplicate changes when unique filenames aren't used #9141
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
davidwengier
commented
Aug 21, 2023
| // For example, when a document moves from the Misc Project to a real project, we will update it here, and each version would | ||
| // have a different project key. On the receiving end however, there is only one file path, therefore one version of the contents, | ||
| // so we must ensure we only have a single document to compute diffs from, or things get out of sync. | ||
| // if (!_languageServerFeatureOptions.IncludeProjectKeyInGeneratedFilePath) |
There was a problem hiding this comment.
This line of code will be commented out in my other open PR, the feature flag doesn't exist in main yet.
davidwengier
commented
Aug 21, 2023
src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/LspLogger.cs
Outdated
Show resolved
Hide resolved
davidwengier
commented
Aug 21, 2023
| @@ -59,7 +59,7 @@ public TextDocumentIdentifier GetTextDocumentIdentifier(SemanticTokensRangeParam | |||
| var semanticTokens = await semanticTokensInfoService.GetSemanticTokensAsync(request.TextDocument, request.Range, documentContext, _razorSemanticTokensLegend.AssumeNotNull(), correlationId, cancellationToken).ConfigureAwait(false); | |||
| var amount = semanticTokens is null ? "no" : (semanticTokens.Data.Length / 5).ToString(Thread.CurrentThread.CurrentCulture); | |||
|
|
|||
| requestContext.Logger.LogInformation("Returned {amount} semantic tokens for range {request.Range} in {request.TextDocument.Uri}.", amount, request.Range, request.TextDocument.Uri); | |||
| requestContext.Logger.LogInformation("Returned {amount} semantic tokens for range ({startLine},{startChar})-({endLine}-{endChar})} in {request.TextDocument.Uri}.", amount, request.Range.Start.Line, request.Range.Start.Character, request.Range.End.Line, request.Range.End.Character, request.TextDocument.Uri); | |||
There was a problem hiding this comment.
Just noticed this in the log. It used to just [Info - 2:31:15 PM] Returned 50 semantic tokens for range Microsoft.VisualStudio.LanguageServer.Protocol.Range in file:///Users/vs/worker/WebApplication1/Pages/Index.cshtml.
davidwengier
commented
Aug 21, 2023
| @@ -155,4 +155,78 @@ public async Task OpenExistingProject() | |||
| var actualProjectFileName = await TestServices.SolutionExplorer.GetAbsolutePathForProjectRelativeFilePathAsync(RazorProjectConstants.BlazorProjectName, RazorProjectConstants.ProjectFile, ControlledHangMitigatingCancellationToken); | |||
| Assert.Equal(expectedProjectFileName, actualProjectFileName); | |||
| } | |||
|
|
|||
| [IdeFact(MaxAttempts = 1)] | |||
| public async Task OpenExistingProject_WithReopenedFile() | |||
There was a problem hiding this comment.
I've added this test, and the one below, just in case, but it turns out they don't fail even without the fixes in this PR, because of other issues. Have started a Teams thread about it.
ryzngard
approved these changes
Aug 21, 2023
ghost
added this to the 
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.
Second attempt at fixing various issues: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1867769, https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1868418, https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1868479, #9131, #9125 and #9060
Also fixes #9138
Turns out my previous fix, which I pulled out of my other PR, didn't quite go far enough and specifically failed for documents that were restored to their open state in VS Code/VS and for documents that were seen to be in the "Misc Files" project before appearing in a real project.