Skip to content

Fix managed/unmanaged keyword completion after typing in function pointer contexts #81017

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 5 commits into from
Nov 4, 2025
Merged

Fix managed/unmanaged keyword completion after typing in function pointer contexts #81017

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b1dc739
Initial plan
Copilot Nov 4, 2025
d6ffa57
Simplify IsFunctionPointerCallingConventionContext to support typing …
Copilot Nov 4, 2025
a9e5e87
Address PR feedback: simplify context check and add cast expression t…
Copilot Nov 4, 2025
9d15ef6
Apply suggestions from code review
CyrusNajmabadi Nov 4, 2025
814cbe5
Update src/EditorFeatures/CSharpTest2/Recommendations/UnmanagedKeywor…
CyrusNajmabadi Nov 4, 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
9 changes: 9 additions & 0 deletions src/EditorFeatures/CSharpTest2/Recommendations/ManagedKeywordRecommenderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,13 @@ class Test {
unsafe void N() {
delegate*$$
""");

[Fact]
Copy link
Member

@CyrusNajmabadi CyrusNajmabadi Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot use [Fact, WorkItem("...")]. Also, test the specific case i n the original bug, where the function pointer type was being written inside a cast.

Copy link
Contributor Author

Copilot AI Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in a9e5e87. Added WorkItem attribute and test for the cast expression case from the original bug report.

public Task TestInFunctionPointerDeclarationAfterTyping()
=> VerifyKeywordAsync(
"""
class Test {
unsafe void N() {
delegate*manag$$
""");
}
9 changes: 9 additions & 0 deletions src/EditorFeatures/CSharpTest2/Recommendations/UnmanagedKeywordRecommenderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,4 +205,13 @@ class Test {
unsafe void N() {
delegate*$$
""");

[Fact]
public Task TestInFunctionPointerDeclarationAfterTyping()
=> VerifyKeywordAsync(
"""
class Test {
unsafe void N() {
delegate*unman$$
""");
}
16 changes: 13 additions & 3 deletions ...edUtilitiesAndExtensions/Workspace/CSharp/Extensions/ContextQuery/SyntaxTreeExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3070,8 +3070,18 @@ public static bool IsEnumTypeMemberAccessContext(this SyntaxTree syntaxTree, Sem

public static bool IsFunctionPointerCallingConventionContext(this SyntaxTree syntaxTree, SyntaxToken targetToken)
{
return targetToken.IsKind(SyntaxKind.AsteriskToken) &&
targetToken.Parent is FunctionPointerTypeSyntax functionPointerType &&
targetToken == functionPointerType.AsteriskToken;
// Check if we're at or after delegate*
Copy link
Member

@CyrusNajmabadi CyrusNajmabadi Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot you just need to check that the target token is an asterix, and the .GetPreviousToken() from it is the delegate keyword. That's all.

Copy link
Contributor Author

Copilot AI Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in a9e5e87. Simplified to just check that targetToken is an asterisk and the previous token is the delegate keyword.

if (targetToken.IsKind(SyntaxKind.AsteriskToken) &&
targetToken.Parent is FunctionPointerTypeSyntax functionPointerType &&
targetToken == functionPointerType.AsteriskToken)
{
return true;
}

// Check if the previous token is the asterisk (handles typing after delegate*)
var previousToken = targetToken.GetPreviousToken();
return previousToken.IsKind(SyntaxKind.AsteriskToken) &&
previousToken.Parent is FunctionPointerTypeSyntax functionPointerType2 &&
previousToken == functionPointerType2.AsteriskToken;
}
}
Loading