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 3 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
23 changes: 23 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 @@ -4,6 +4,7 @@

using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Test.Utilities;
using Roslyn.Test.Utilities;
using Xunit;

namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Recommendations;
Expand All @@ -28,4 +29,26 @@ class Test {
unsafe void N() {
delegate*$$
""");

[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/81015")]
public Task TestInFunctionPointerDeclarationAfterTyping()
=> VerifyKeywordAsync(
"""
class Test {
unsafe void N() {
delegate*manag$$
""");

[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/81015")]
public Task TestInCastExpressionAfterTyping()
=> VerifyKeywordAsync(
"""
class C
{
unsafe static void M()
{
_ = (delegate*manag$$)&M;
}
}
""");
}
23 changes: 23 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 @@ -4,6 +4,7 @@

using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Test.Utilities;
using Roslyn.Test.Utilities;
using Xunit;

namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Recommendations;
Expand Down Expand Up @@ -205,4 +206,26 @@ class Test {
unsafe void N() {
delegate*$$
""");

[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/81015")]
public Task TestInFunctionPointerDeclarationAfterTyping()
=> VerifyKeywordAsync(
"""
class Test {
unsafe void N() {
delegate*unman$$
""");

[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/81015")]
public Task TestInCastExpressionAfterTyping()
=> VerifyKeywordAsync(
"""
class C
{
unsafe static void M()
{
_ = (delegate*unman$$)&M;
}
}
""");
}
3 changes: 1 addition & 2 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 @@ -3071,7 +3071,6 @@ 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;
targetToken.GetPreviousToken().IsKind(SyntaxKind.DelegateKeyword);
}
}