Skip to content
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

Fully qualify return type on UnreachableException methods #87661

Merged
merged 3 commits into from
Jun 16, 2023
Merged

Fully qualify return type on UnreachableException methods #87661

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc6356f
Fully qualify return type on UnreachableException methods
jtschuster Jun 15, 2023
a089fdc
Add test
jtschuster Jun 16, 2023
7a0e1ed
Update src/libraries/System.Runtime.InteropServices/gen/ComInterfaceG…
jtschuster Jun 16, 2023
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
1 change: 1 addition & 0 deletions src/libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComMethodContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ private MethodDeclarationSyntax CreateUnreachableExceptionStub()
{
// DeclarationCopiedFromBaseDeclaration(<Arguments>) => throw new UnreachableException("This method should not be reached");
jtschuster marked this conversation as resolved.
Show resolved Hide resolved
return MethodInfo.Syntax
.WithReturnType(GenerationContext.SignatureContext.StubReturnType)
.WithModifiers(TokenList())
.WithAttributeLists(List<AttributeListSyntax>())
.WithExplicitInterfaceSpecifier(ExplicitInterfaceSpecifier(
Expand Down
27 changes: 27 additions & 0 deletions ...ies/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Unit.Tests/CodeSnippets.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,33 @@ partial interface {|#0:IComInterface2|} : IComInterface, IOtherComInterface
}
""";

public string DerivedWithParametersDeclaredInOtherNamespace => $$"""
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.Marshalling;
using OtherNS;

namespace OtherNS
{
public struct NewType;
}

namespace Test
{
{{GeneratedComInterface()}}
partial interface IComInterface
{
NewType Method(NewType p);
}

{{GeneratedComInterface()}}
partial interface IComInterface2 : IComInterface
{
NewType Method2(NewType p);
}
}
""";

public string DerivedWithStringMarshalling(params
(StringMarshalling StringMarshalling, Type? StringMarshallingCustomType)[] attributeArguments)
{
Expand Down
4 changes: 2 additions & 2 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 @@ -8,9 +8,8 @@
using System.Threading.Tasks;
using Microsoft.Interop.UnitTests;
using Xunit;

using VerifyVTableGenerator = Microsoft.Interop.UnitTests.Verifiers.CSharpSourceGeneratorVerifier<Microsoft.Interop.VtableIndexStubGenerator>;
using VerifyComInterfaceGenerator = Microsoft.Interop.UnitTests.Verifiers.CSharpSourceGeneratorVerifier<Microsoft.Interop.ComInterfaceGenerator>;
using VerifyVTableGenerator = Microsoft.Interop.UnitTests.Verifiers.CSharpSourceGeneratorVerifier<Microsoft.Interop.VtableIndexStubGenerator>;

namespace ComInterfaceGenerator.Unit.Tests
{
Expand Down Expand Up @@ -334,6 +333,7 @@ public static IEnumerable<object[]> ComInterfaceSnippetsToCompile()
{
CodeSnippets codeSnippets = new(new GeneratedComInterfaceAttributeProvider());
yield return new object[] { ID(), codeSnippets.DerivedComInterfaceType };
yield return new object[] { ID(), codeSnippets.DerivedWithParametersDeclaredInOtherNamespace };
yield return new object[] { ID(), codeSnippets.ComInterfaceParameters };
}

Expand Down