Skip to content

Strip partial and virtual modifiers from generated COM interface method stubs #126719

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

Open
Copilot wants to merge 5 commits into
base: main
Choose a base branch
from
+25 −2
Open

Strip partial and virtual modifiers from generated COM interface method stubs #126719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d9b78a2
Initial plan
Copilot Apr 9, 2026
67bdc98
Strip partial modifier from method syntax in ComInterfaceGenerator an…
Copilot Apr 9, 2026
570e591
Apply suggestions from code review
jtschuster Apr 9, 2026
b788d1d
Apply suggestions from code review
jtschuster Apr 10, 2026
852730f
Also strip virtual modifier from generated COM interface method stubs
Copilot Apr 13, 2026
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
2 changes: 1 addition & 1 deletion ...braries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComInterfaceGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ internal static IncrementalMethodStubGenerationContext CalculateStubInformation(

var containingSyntaxContext = new ContainingSyntaxContext(syntax);
var methodSyntaxTemplate = new ContainingSyntax(
new SyntaxTokenList(syntax.Modifiers.Where(static m => !m.IsKind(SyntaxKind.NewKeyword))).StripAccessibilityModifiers(),
new SyntaxTokenList(syntax.Modifiers.Where(static m => !m.IsKind(SyntaxKind.NewKeyword) && !m.IsKind(SyntaxKind.PartialKeyword) && !m.IsKind(SyntaxKind.VirtualKeyword))).StripAccessibilityModifiers(),
SyntaxKind.MethodDeclaration,
syntax.Identifier,
syntax.TypeParameterList);
Expand Down
2 changes: 1 addition & 1 deletion ...ries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/VtableIndexStubGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ internal static SourceAvailableIncrementalMethodStubGenerationContext CalculateS

var containingSyntaxContext = new ContainingSyntaxContext(syntax);

var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);
var methodSyntaxTemplate = new ContainingSyntax(new SyntaxTokenList(syntax.Modifiers.Where(static m => !m.IsKind(SyntaxKind.PartialKeyword) && !m.IsKind(SyntaxKind.VirtualKeyword))).StripAccessibilityModifiers(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);

ImmutableArray<FunctionPointerUnmanagedCallingConventionSyntax> callConv = VirtualMethodPointerStubGenerator.GenerateCallConvSyntaxFromAttributes(suppressGCTransitionAttribute, unmanagedCallConvAttribute, defaultCallingConventions: ImmutableArray<FunctionPointerUnmanagedCallingConventionSyntax>.Empty);

Expand Down
23 changes: 23 additions & 0 deletions ...braries/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Unit.Tests/Compiles.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,29 @@ public async Task ValidateComInterfaceSnippets(string id, string source)
await VerifyComInterfaceGenerator.VerifySourceGeneratorAsync(source);
}

[Fact]
public async Task PartialMethodModifierOnComInterfaceMethodCompiles()
{
string source = """
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.Marshalling;

[GeneratedComInterface]
[Guid("9D3FD745-3C90-4C10-B140-FAFB01E3541D")]
internal partial interface IComInterface
{
void Method();
public virtual partial void PartialMethod();
}
internal partial interface IComInterface
{
public virtual partial void PartialMethod() { }
}
""";

await VerifyComInterfaceGenerator.VerifySourceGeneratorAsync(source);
}

[Fact]
public async Task DocumentedComInterfaceDoesNotProduceCS1591Warnings()
{
Expand Down
Loading