Fix issue in watch window completion #77204
Open
+72
−54
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
The issue here is when the watch window contains
for (int i = 0; i < 10; i++)
[Console.WriteLine(i);]
where [] denotes the current statement. In that case, the adjusted context should be at the start of Console.WriteLine. Additionally, a semicolon should not be placed in the generated projection buffer before debuggerMappedSpan, as that would place debuggerMappedSpan outside the for loop.
Fixes dotnet#42718
dotnet-issue-labeler
bot
added
Area-IDE
untriaged
ToddGrun
commented
Feb 13, 2025
| @@ -152,21 +148,10 @@ private bool TrySetContext( | |||
| regionEdit.Apply(); | |||
| } | |||
|
|
|||
| // Adjust the context point to ensure that the right information is in scope. | |||
| // For example, we may need to move the point to the end of the last statement in a method body | |||
There was a problem hiding this comment.
This comment is not true, and led me astray for quite a while.
ToddGrun
commented
Feb 13, 2025
| var contextPoint = this.ContextBuffer.CurrentSnapshot.GetLineFromLineNumber(CurrentStatementSpan.iEndLine).Start + CurrentStatementSpan.iEndIndex; | ||
| var adjustedContextPoint = GetAdjustedContextPoint(contextPoint, document); |
There was a problem hiding this comment.
I found having multiple abstract methods made this more confusing, and I needed to add in another concept which would have made this worse. Instead, just a single abstract method that just returns the end projection buffer and let the language implementations stitch them together themselves.
|
@genlu or @jasonmalinowski -- as the bug mentions, this area is magic, but I think I found an incantation to make this scenario work. |
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
The issue here is when the watch window contains
for (int i = 0; i < 10; i++)
[Console.WriteLine(i);]
where [] denotes the current statement. In that case, the adjusted context should be at the start of Console.WriteLine. Additionally, a semicolon should not be placed in the generated projection buffer before debuggerMappedSpan, as that would place debuggerMappedSpan outside the for loop.
Fixes #42718