Skip to content

[release/8.0-staging] Check if AttributeData for InterfaceTypeAttribute is not null in ConvertComImportToGeneratedComInterfaceAnalyzer #98873

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
jkoritzinsky merged 1 commit into from
Mar 11, 2024
Merged

[release/8.0-staging] Check if AttributeData for InterfaceTypeAttribute is not null in ConvertComImportToGeneratedComInterfaceAnalyzer #98873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ...es/gen/ComInterfaceGenerator/Analyzers/ConvertComImportToGeneratedComInterfaceAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public override void Initialize(AnalysisContext context)
INamedTypeSymbol type = (INamedTypeSymbol)context.Symbol;
AttributeData? interfaceTypeAttributeData = type.GetAttributes().FirstOrDefault(a => a.AttributeClass.Equals(interfaceTypeAttribute, SymbolEqualityComparer.Default));
if (type is not { TypeKind: TypeKind.Interface, IsComImport: true }
|| interfaceTypeAttributeData.ConstructorArguments.Length == 1 && (int)interfaceTypeAttributeData.ConstructorArguments[0].Value != (int)ComInterfaceType.InterfaceIsIUnknown)
|| interfaceTypeAttributeData is not { ConstructorArguments: [{ Value: (int)ComInterfaceType.InterfaceIsIUnknown }] })
{
return;
}
Expand Down
38 changes: 38 additions & 0 deletions ...ropServices/tests/ComInterfaceGenerator.Unit.Tests/ConvertToGeneratedComInterfaceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,5 +370,43 @@ public struct HResult

await VerifyCS.VerifyCodeFixAsync(source, fixedSource);
}

[Fact]
public async Task UnsupportedInterfaceTypes_DoesNotReportDiagnostic()
{
// This also tests the case where InterfaceType is missing (defaulting to ComInterfaceType.InterfaceIsDual).
string source = """
using System.Runtime.InteropServices;

[ComImport]
[Guid("73EB4AF8-BE9C-4b49-B3A4-24F4FF657B26")]
public interface IInterfaceIsDualMissingAttribute
{
}

[ComImport]
[Guid("5DA39CDF-DCAD-447A-836E-EA80DB34D81B")]
[InterfaceType(ComInterfaceType.InterfaceIsDual)]
public interface IInterfaceIsDual
{
}

[ComImport]
[Guid("F59AB2FE-523D-4B28-911C-21363808C51E")]
[InterfaceType(ComInterfaceType.InterfaceIsIDispatch)]
public interface IInterfaceIsIDispatch
{
}

[ComImport]
[Guid("DC1C5A9C-E88A-4dde-A5A1-60F82A20AEF7")]
[InterfaceType(ComInterfaceType.InterfaceIsIInspectable)]
public interface IInterfaceIsIInspectable
{
}
""";

await VerifyCS.VerifyCodeFixAsync(source, source);
}
}
}