Skip to content

Fix watch window completion window upon manual completion invocation #77656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 18, 2025
Merged

Fix watch window completion window upon manual completion invocation #77656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fca1f29
Fix watch window completion window upon manual completion invocation
ToddGrun Mar 18, 2025
2f7eb98
add comment to indicate why we use a space instead of an empty string.
ToddGrun Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/VisualStudio/CSharp/Impl/LanguageService/CSharpDebuggerIntelliSenseContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,18 +102,21 @@ protected override IProjectionBuffer GetAdjustedBuffer(int contextPoint, Documen
// where [] denotes CurrentStatementSpan, should use the start of CurrentStatementSpan
// as the adjusted context, and should not place a semicolon before debuggerMappedSpan.
// Not doing either of those would place debuggerMappedSpan outside the for loop.
separatorBeforeDebuggerMappedSpan = string.Empty;
// We use a space as the separator in this case (instead of an empty string) to help
// the vs editor out and not have a projection seam at the location they will bring
// up completion.
separatorBeforeDebuggerMappedSpan = " ";
adjustedStart = token.Parent.SpanStart;
}

var beforeAdjustedStart = ContextBuffer.CurrentSnapshot.CreateTrackingSpan(Span.FromBounds(0, adjustedStart), SpanTrackingMode.EdgeNegative);
var afterAdjustedStart = ContextBuffer.CurrentSnapshot.CreateTrackingSpanFromIndexToEnd(adjustedStart, SpanTrackingMode.EdgePositive);

return ProjectionBufferFactoryService.CreateProjectionBuffer(
projectionEditResolver: null,
sourceSpans: [beforeAdjustedStart, separatorBeforeDebuggerMappedSpan, debuggerMappedSpan, StatementTerminator, afterAdjustedStart],
options: ProjectionBufferOptions.None,
contentType: ContentType);
projectionEditResolver: null,
sourceSpans: [beforeAdjustedStart, separatorBeforeDebuggerMappedSpan, debuggerMappedSpan, StatementTerminator, afterAdjustedStart],
options: ProjectionBufferOptions.None,
contentType: ContentType);
}

public override bool CompletionStartsOnQuestionMark
Expand Down
23 changes: 23 additions & 0 deletions src/VisualStudio/Core/Test/DebuggerIntelliSense/CSharpDebuggerIntellisenseTests.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,29 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.DebuggerIntelliSense
End Using
End Function

<WpfFact>
Public Async Function SingleStatementBlockInvokeCompletion() As Task
Dim text = <Workspace>
<Project Language="C#" CommonReferences="true">
<Document>class Program
{
static void Main()
{
for (int variable1 = 0; variable1 &lt; 10; variable1++)
[|Console.Write(0);|]
int variable2 = 0;
}
}</Document>
</Project>
</Workspace>

Using state = TestState.CreateCSharpTestState(text, False)
Await state.WaitForAsynchronousOperationsAsync()
state.SendInvokeCompletionList()
Await state.AssertCompletionItemsContainAll("variable1")
End Using
End Function

<WpfFact>
Public Async Function SignatureHelpInParameterizedConstructor() As Task
Dim text = <Workspace>
Expand Down
Loading