Strip trivia from tokens.#88856

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 6 commits into from
Jul 14, 2023
Merged

Strip trivia from tokens. #88856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a17cffe
Strip trivia from tokens.
jkoritzinsky Jul 13, 2023
55ff5d8
Move the trivia stripping into ContainingSyntax record constructor
jkoritzinsky Jul 13, 2023
7808204
Make ContainingSyntax a regular struct with a primary constructor ins…
jkoritzinsky Jul 13, 2023
9deb8a7
Merge branch 'trivia' of github.com:jkoritzinsky/runtime; branch 'mai…
jkoritzinsky Jul 13, 2023
d42fc74
Fix #88867
jkoritzinsky Jul 13, 2023
0a7b306
Suppress compiler diagnostics based on the linked issue.
jkoritzinsky Jul 13, 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
2 changes: 1 addition & 1 deletion ...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSExportGenerator.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -206,7 +206,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);

return new IncrementalStubGenerationContext(
signatureContext,
Expand Down
2 changes: 1 addition & 1 deletion ...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSImportGenerator.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -194,7 +194,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
return new IncrementalStubGenerationContext(
signatureContext,
containingTypeContext,
Expand Down
2 changes: 1 addition & 1 deletion ...braries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComInterfaceGenerator.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -306,7 +306,7 @@ private static IncrementalMethodStubGenerationContext CalculateStubInformation(M

var containingSyntaxContext = new ContainingSyntaxContext(syntax);

var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers().StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);
var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);

ImmutableArray<FunctionPointerUnmanagedCallingConventionSyntax> callConv = VirtualMethodPointerStubGenerator.GenerateCallConvSyntaxFromAttributes(
suppressGCTransitionAttribute,
Expand Down
2 changes: 1 addition & 1 deletion ...ries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/VtableIndexStubGenerator.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -278,7 +278,7 @@ private static IncrementalMethodStubGenerationContext CalculateStubInformation(M

var containingSyntaxContext = new ContainingSyntaxContext(syntax);

var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers().StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);
var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);

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

Expand Down
2 changes: 1 addition & 1 deletion ...aries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -288,7 +288,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);

List<AttributeSyntax> additionalAttributes = GenerateSyntaxForForwardedAttributes(suppressGCTransitionAttribute, unmanagedCallConvAttribute, defaultDllImportSearchPathsAttribute);
return new IncrementalStubGenerationContext(
Expand Down
20 changes: 17 additions & 3 deletions ...Runtime.InteropServices/gen/Microsoft.Interop.SourceGeneration/ContainingSyntaxContext.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,18 @@

namespace Microsoft.Interop
{
public readonly record struct ContainingSyntax(SyntaxTokenList Modifiers, SyntaxKind TypeKind, SyntaxToken Identifier, TypeParameterListSyntax? TypeParameters)
public readonly struct ContainingSyntax(SyntaxTokenList modifiers, SyntaxKind typeKind, SyntaxToken identifier, TypeParameterListSyntax? typeParameters) : IEquatable<ContainingSyntax>
{
public SyntaxTokenList Modifiers { get; init; } = modifiers.StripTriviaFromTokens();

public SyntaxToken Identifier { get; init; } = identifier.WithoutTrivia();

public SyntaxKind TypeKind { get; init; } = typeKind;

public TypeParameterListSyntax? TypeParameters { get; init; } = typeParameters;

public override bool Equals(object obj) => obj is ContainingSyntax other && Equals(other);

public bool Equals(ContainingSyntax other)
{
return Modifiers.SequenceEqual(other.Modifiers, SyntaxEquivalentComparer.Instance)
Expand DownExpand Up@@ -42,8 +52,12 @@ private static ImmutableArray<ContainingSyntax> GetContainingTypes(MemberDeclara
ImmutableArray<ContainingSyntax>.Builder containingTypeInfoBuilder = ImmutableArray.CreateBuilder<ContainingSyntax>();
for (SyntaxNode? parent = memberDeclaration.Parent; parent is TypeDeclarationSyntax typeDeclaration; parent = parent.Parent)
{
containingTypeInfoBuilder.Add(new ContainingSyntax(typeDeclaration.Modifiers.StripTriviaFromTokens(), typeDeclaration.Kind(), typeDeclaration.Identifier.WithoutTrivia(),
typeDeclaration.TypeParameterList));
containingTypeInfoBuilder.Add(
new ContainingSyntax(
typeDeclaration.Modifiers,
typeDeclaration.Kind(),
typeDeclaration.Identifier,
typeDeclaration.TypeParameterList));
}

return containingTypeInfoBuilder.ToImmutable();
Expand Down
53 changes: 14 additions & 39 deletions ...ies/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Unit.Tests/CompileFails.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -558,69 +558,45 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnValueTypes()

// [In] is default for all non-pinned marshalled types
yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
inAttributeIsDefaultDiagnostic,
//https://github.com/dotnet/runtime/issues/88540
inAttributeIsDefaultDiagnostic } };
yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute, "byte", paramNameWithLocation), new DiagnosticResult[] {
inAttributeIsDefaultDiagnostic,
//https://github.com/dotnet/runtime/issues/88540
inAttributeIsDefaultDiagnostic } };
yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
inAttributeIsDefaultDiagnostic,
//https://github.com/dotnet/runtime/issues/88540
inAttributeIsDefaultDiagnostic } };
yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + "[MarshalAs(UnmanagedType.U2)]", "char", paramNameWithLocation), new DiagnosticResult[] {
inAttributeIsDefaultDiagnostic,
//https://github.com/dotnet/runtime/issues/88540
inAttributeIsDefaultDiagnostic } };

// [Out] is not allowed on value types passed by value - there is no indirection for the callee to make visible modifications.
var outAttributeNotSupportedOnValueParameters = new DiagnosticResult(GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails)
.WithLocation(0)
.WithArguments(SR.OutAttributeNotSupportedOnByValueParameters, paramName);
yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
outAttributeNotSupportedOnValueParameters,
//https://github.com/dotnet/runtime/issues/88540
outAttributeNotSupportedOnValueParameters } };
yield return new object[] {
ID(),
codeSnippets.ByValueMarshallingOfType(outAttribute, "IntStruct", paramNameWithLocation) + CodeSnippets.IntStructAndMarshaller,
new DiagnosticResult[] {
outAttributeNotSupportedOnValueParameters,
//https://github.com/dotnet/runtime/issues/88540
outAttributeNotSupportedOnValueParameters,
outAttributeNotSupportedOnValueParameters
} };
yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
outAttributeNotSupportedOnValueParameters,
//https://github.com/dotnet/runtime/issues/88540
outAttributeNotSupportedOnValueParameters
} };
yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute, "[MarshalAs(UnmanagedType.U2)] char", paramNameWithLocation), new DiagnosticResult[] {
outAttributeNotSupportedOnValueParameters,
//https://github.com/dotnet/runtime/issues/88540
outAttributeNotSupportedOnValueParameters
} };
// [In,Out] should only warn for Out attribute
yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute+outAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
outAttributeNotSupportedOnValueParameters,
//https://github.com/dotnet/runtime/issues/88540
outAttributeNotSupportedOnValueParameters } };
yield return new object[] {
ID(),
codeSnippets.ByValueMarshallingOfType(inAttribute+outAttribute, "IntStruct", paramNameWithLocation) + CodeSnippets.IntStructAndMarshaller,
new DiagnosticResult[] {
outAttributeNotSupportedOnValueParameters,
//https://github.com/dotnet/runtime/issues/88540
outAttributeNotSupportedOnValueParameters,
outAttributeNotSupportedOnValueParameters
} };
yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
outAttributeNotSupportedOnValueParameters,
//https://github.com/dotnet/runtime/issues/88540
outAttributeNotSupportedOnValueParameters
} };
yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute, "[MarshalAs(UnmanagedType.U2)] char", paramNameWithLocation), new DiagnosticResult[] {
outAttributeNotSupportedOnValueParameters,
//https://github.com/dotnet/runtime/issues/88540
outAttributeNotSupportedOnValueParameters
} };

Expand DownExpand Up@@ -688,12 +664,12 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnReferenceTypes()
yield return new object[] {
ID(),
codeSnippets.ByValueMarshallingOfType(inAttribute, "string", paramNameWithLocation, (StringMarshalling.Utf8, null)),
new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic }
new DiagnosticResult[] { inAttributeIsDefaultDiagnostic }
};
yield return new object[] {
ID(),
codeSnippets.ByValueMarshallingOfType(inAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic }
new DiagnosticResult[] { inAttributeIsDefaultDiagnostic }
};

var outNotAllowedOnRefTypes = new DiagnosticResult(GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails)
Expand All@@ -704,21 +680,21 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnReferenceTypes()
yield return new object[] {
ID(),
codeSnippets.ByValueMarshallingOfType(outAttribute, "string", paramNameWithLocation, (StringMarshalling.Utf8, null)),
new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
new DiagnosticResult[] { outNotAllowedOnRefTypes }
};

// [Out] warns on by value reference types
yield return new object[] {
ID(),
codeSnippets.ByValueMarshallingOfType(outAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
new DiagnosticResult[] { outNotAllowedOnRefTypes }
};

// [In,Out] is fine on classes
yield return new object[] {
ID(),
codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
new DiagnosticResult[] { outNotAllowedOnRefTypes }
};

// All refkinds are okay on classes and strings
Expand DownExpand Up@@ -774,11 +750,10 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
.WithLocation(0)
.WithArguments(SR.InAttributeOnlyNotSupportedOnPinnedParameters, paramName);
yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + constElementCount, "int[]", paramNameWithLocation), new DiagnosticResult[] {
inAttributeNotSupportedOnPinnedParameter,
//https://github.com/dotnet/runtime/issues/88540
inAttributeNotSupportedOnPinnedParameter
}};
// new issue before merge: char generated code doesn't seem to work well with [In, Out]
// blittable arrays don't support [In] only. Different diagnostics are issued because we can pin in one direction (managed->unmanaged)
// but not the other direction.
yield return new object[] {
ID(),
codeSnippets.ByValueMarshallingOfType(inAttribute + constElementCount, "char[]", paramNameWithLocation, (StringMarshalling.Utf16, null)),
Expand All@@ -793,13 +768,13 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
"bool[]",
paramNameWithLocation,
(StringMarshalling.Utf16, null)),
new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic}
new DiagnosticResult[] { inAttributeIsDefaultDiagnostic}
};
// Overriding marshalling with a custom marshaller makes it not pinned
yield return new object[] {
ID(),
codeSnippets.ByValueMarshallingOfType(inAttribute, "[MarshalUsing(typeof(IntMarshaller), ElementIndirectionDepth = 1), MarshalUsing(ConstantElementCount = 10)]int[]", paramNameWithLocation) + CodeSnippets.IntMarshaller,
new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic}
new DiagnosticResult[] { inAttributeIsDefaultDiagnostic}
};

// [In, Out] is default
Expand All@@ -811,12 +786,12 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
yield return new object[] {
ID(),
codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + constElementCount, "int[]", paramNameWithLocation),
new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic, inOutAttributeIsDefaultDiagnostic}
new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic}
};
yield return new object[] {
ID(),
codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + constElementCount, "char[]", paramNameWithLocation, (StringMarshalling.Utf16, null)),
//https://github.com/dotnet/runtime/issues/88540
//https://github.com/dotnet/runtime/issues/88708
new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic }
};

Expand DownExpand Up@@ -847,7 +822,7 @@ public async Task VerifyByValueMarshallingAttributeUsage(string id, string sourc
{
TestCode = source,
TestBehaviors = TestBehaviors.SkipGeneratedSourcesCheck,
// Our fallback mechanism for invalid code for unmanaged->managed stubs sometimes generates invalid code.
// https://github.com/dotnet/runtime/issues/88708
CompilerDiagnostics = diagnostics.Length != 0 ? CompilerDiagnostics.None : CompilerDiagnostics.Errors,
};
test.ExpectedDiagnostics.AddRange(diagnostics);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Strip trivia from tokens.#88856

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 6 commits into

from

Jul 14, 2023
 Merged


Strip trivia from tokens.
#88856
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
a17cffe

Strip trivia from tokens.


jkoritzinsky Jul 13, 2023
55ff5d8

Move the trivia stripping into ContainingSyntax record constructor


jkoritzinsky Jul 13, 2023
7808204

Make ContainingSyntax a regular struct with a primary constructor ins…


jkoritzinsky Jul 13, 2023
9deb8a7

Merge branch 'trivia' of github.com:jkoritzinsky/runtime; branch 'mai…


jkoritzinsky Jul 13, 2023
d42fc74

Fix #88867


jkoritzinsky Jul 13, 2023
0a7b306

Suppress compiler diagnostics based on the linked issue.


jkoritzinsky Jul 13, 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


2 changes: 1 addition & 1 deletion
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSExportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -206,7 +206,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

 var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);

 return new IncrementalStubGenerationContext(
 signatureContext,
Expand Down

2 changes: 1 addition & 1 deletion
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSImportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -194,7 +194,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

 var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 return new IncrementalStubGenerationContext(
 signatureContext,
 containingTypeContext,
Expand Down

2 changes: 1 addition & 1 deletion
...braries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComInterfaceGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -306,7 +306,7 @@ private static IncrementalMethodStubGenerationContext CalculateStubInformation(M

 var containingSyntaxContext = new ContainingSyntaxContext(syntax);

 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers().StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);

 ImmutableArray<FunctionPointerUnmanagedCallingConventionSyntax> callConv = VirtualMethodPointerStubGenerator.GenerateCallConvSyntaxFromAttributes(
 suppressGCTransitionAttribute,
Expand Down

2 changes: 1 addition & 1 deletion
...ries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/VtableIndexStubGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -278,7 +278,7 @@ private static IncrementalMethodStubGenerationContext CalculateStubInformation(M

 var containingSyntaxContext = new ContainingSyntaxContext(syntax);

 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers().StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);

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

Expand Down

2 changes: 1 addition & 1 deletion
...aries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -288,7 +288,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

 var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);

 List<AttributeSyntax> additionalAttributes = GenerateSyntaxForForwardedAttributes(suppressGCTransitionAttribute, unmanagedCallConvAttribute, defaultDllImportSearchPathsAttribute);
 return new IncrementalStubGenerationContext(
Expand Down

20 changes: 17 additions & 3 deletions
...Runtime.InteropServices/gen/Microsoft.Interop.SourceGeneration/ContainingSyntaxContext.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,18 @@

namespace Microsoft.Interop
{
 public readonly record struct ContainingSyntax(SyntaxTokenList Modifiers, SyntaxKind TypeKind, SyntaxToken Identifier, TypeParameterListSyntax? TypeParameters)
 public readonly struct ContainingSyntax(SyntaxTokenList modifiers, SyntaxKind typeKind, SyntaxToken identifier, TypeParameterListSyntax? typeParameters) : IEquatable<ContainingSyntax>
 {
 public SyntaxTokenList Modifiers { get; init; } = modifiers.StripTriviaFromTokens();

 public SyntaxToken Identifier { get; init; } = identifier.WithoutTrivia();

 public SyntaxKind TypeKind { get; init; } = typeKind;

 public TypeParameterListSyntax? TypeParameters { get; init; } = typeParameters;

 public override bool Equals(object obj) => obj is ContainingSyntax other && Equals(other);

 public bool Equals(ContainingSyntax other)
 {
 return Modifiers.SequenceEqual(other.Modifiers, SyntaxEquivalentComparer.Instance)
Expand DownExpand Up@@ -42,8 +52,12 @@ private static ImmutableArray<ContainingSyntax> GetContainingTypes(MemberDeclara
 ImmutableArray<ContainingSyntax>.Builder containingTypeInfoBuilder = ImmutableArray.CreateBuilder<ContainingSyntax>();
 for (SyntaxNode? parent = memberDeclaration.Parent; parent is TypeDeclarationSyntax typeDeclaration; parent = parent.Parent)
 {
 containingTypeInfoBuilder.Add(new ContainingSyntax(typeDeclaration.Modifiers.StripTriviaFromTokens(), typeDeclaration.Kind(), typeDeclaration.Identifier.WithoutTrivia(),
 typeDeclaration.TypeParameterList));
 containingTypeInfoBuilder.Add(
 new ContainingSyntax(
 typeDeclaration.Modifiers,
 typeDeclaration.Kind(),
 typeDeclaration.Identifier,
 typeDeclaration.TypeParameterList));
 }

 return containingTypeInfoBuilder.ToImmutable();
Expand Down

53 changes: 14 additions & 39 deletions
...ies/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Unit.Tests/CompileFails.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -558,69 +558,45 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnValueTypes()

 // [In] is default for all non-pinned marshalled types
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute, "byte", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + "[MarshalAs(UnmanagedType.U2)]", "char", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };

 // [Out] is not allowed on value types passed by value - there is no indirection for the callee to make visible modifications.
 var outAttributeNotSupportedOnValueParameters = new DiagnosticResult(GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails)
 .WithLocation(0)
 .WithArguments(SR.OutAttributeNotSupportedOnByValueParameters, paramName);
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters } };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(outAttribute, "IntStruct", paramNameWithLocation) + CodeSnippets.IntStructAndMarshaller,
 new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters,
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute, "[MarshalAs(UnmanagedType.U2)] char", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };
 // [In,Out] should only warn for Out attribute
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute+outAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters } };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute+outAttribute, "IntStruct", paramNameWithLocation) + CodeSnippets.IntStructAndMarshaller,
 new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters,
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute, "[MarshalAs(UnmanagedType.U2)] char", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };

Expand DownExpand Up@@ -688,12 +664,12 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnReferenceTypes()
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute, "string", paramNameWithLocation, (StringMarshalling.Utf8, null)),
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic }
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic }
 };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic }
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic }
 };

 var outNotAllowedOnRefTypes = new DiagnosticResult(GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails)
Expand All@@ -704,21 +680,21 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnReferenceTypes()
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(outAttribute, "string", paramNameWithLocation, (StringMarshalling.Utf8, null)),
 new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
 new DiagnosticResult[] { outNotAllowedOnRefTypes }
 };

 // [Out] warns on by value reference types
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(outAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
 new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
 new DiagnosticResult[] { outNotAllowedOnRefTypes }
 };

 // [In,Out] is fine on classes
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
 new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
 new DiagnosticResult[] { outNotAllowedOnRefTypes }
 };

 // All refkinds are okay on classes and strings
Expand DownExpand Up@@ -774,11 +750,10 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
 .WithLocation(0)
 .WithArguments(SR.InAttributeOnlyNotSupportedOnPinnedParameters, paramName);
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + constElementCount, "int[]", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeNotSupportedOnPinnedParameter,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeNotSupportedOnPinnedParameter
 }};
 // new issue before merge: char generated code doesn't seem to work well with [In, Out]
 // blittable arrays don't support [In] only. Different diagnostics are issued because we can pin in one direction (managed->unmanaged)
 // but not the other direction.
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + constElementCount, "char[]", paramNameWithLocation, (StringMarshalling.Utf16, null)),
Expand All@@ -793,13 +768,13 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
 "bool[]",
 paramNameWithLocation,
 (StringMarshalling.Utf16, null)),
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic}
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic}
 };
 // Overriding marshalling with a custom marshaller makes it not pinned
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute, "[MarshalUsing(typeof(IntMarshaller), ElementIndirectionDepth = 1), MarshalUsing(ConstantElementCount = 10)]int[]", paramNameWithLocation) + CodeSnippets.IntMarshaller,
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic}
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic}
 };

 // [In, Out] is default
Expand All@@ -811,12 +786,12 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + constElementCount, "int[]", paramNameWithLocation),
 new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic, inOutAttributeIsDefaultDiagnostic}
 new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic}
 };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + constElementCount, "char[]", paramNameWithLocation, (StringMarshalling.Utf16, null)),
 //https://github.com/dotnet/runtime/issues/88540
 //https://github.com/dotnet/runtime/issues/88708
 new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic }
 };

Expand DownExpand Up@@ -847,7 +822,7 @@ public async Task VerifyByValueMarshallingAttributeUsage(string id, string sourc
 {
 TestCode = source,
 TestBehaviors = TestBehaviors.SkipGeneratedSourcesCheck,
 // Our fallback mechanism for invalid code for unmanaged->managed stubs sometimes generates invalid code.
 // https://github.com/dotnet/runtime/issues/88708
 CompilerDiagnostics = diagnostics.Length != 0 ? CompilerDiagnostics.None : CompilerDiagnostics.Errors,
 };
 test.ExpectedDiagnostics.AddRange(diagnostics);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Strip trivia from tokens.#88856

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 6 commits into

from

Jul 14, 2023
 Merged


Strip trivia from tokens.
#88856
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
a17cffe

Strip trivia from tokens.


jkoritzinsky Jul 13, 2023
55ff5d8

Move the trivia stripping into ContainingSyntax record constructor


jkoritzinsky Jul 13, 2023
7808204

Make ContainingSyntax a regular struct with a primary constructor ins…


jkoritzinsky Jul 13, 2023
9deb8a7

Merge branch 'trivia' of github.com:jkoritzinsky/runtime; branch 'mai…


jkoritzinsky Jul 13, 2023
d42fc74

Fix #88867


jkoritzinsky Jul 13, 2023
0a7b306

Suppress compiler diagnostics based on the linked issue.


jkoritzinsky Jul 13, 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


2 changes: 1 addition & 1 deletion
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSExportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -206,7 +206,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

 var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);

 return new IncrementalStubGenerationContext(
 signatureContext,
Expand Down

2 changes: 1 addition & 1 deletion
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSImportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -194,7 +194,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

 var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 return new IncrementalStubGenerationContext(
 signatureContext,
 containingTypeContext,
Expand Down

2 changes: 1 addition & 1 deletion
...braries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComInterfaceGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -306,7 +306,7 @@ private static IncrementalMethodStubGenerationContext CalculateStubInformation(M

 var containingSyntaxContext = new ContainingSyntaxContext(syntax);

 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers().StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);

 ImmutableArray<FunctionPointerUnmanagedCallingConventionSyntax> callConv = VirtualMethodPointerStubGenerator.GenerateCallConvSyntaxFromAttributes(
 suppressGCTransitionAttribute,
Expand Down

2 changes: 1 addition & 1 deletion
...ries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/VtableIndexStubGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -278,7 +278,7 @@ private static IncrementalMethodStubGenerationContext CalculateStubInformation(M

 var containingSyntaxContext = new ContainingSyntaxContext(syntax);

 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers().StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);

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

Expand Down

2 changes: 1 addition & 1 deletion
...aries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -288,7 +288,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

 var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);

 List<AttributeSyntax> additionalAttributes = GenerateSyntaxForForwardedAttributes(suppressGCTransitionAttribute, unmanagedCallConvAttribute, defaultDllImportSearchPathsAttribute);
 return new IncrementalStubGenerationContext(
Expand Down

20 changes: 17 additions & 3 deletions
...Runtime.InteropServices/gen/Microsoft.Interop.SourceGeneration/ContainingSyntaxContext.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,18 @@

namespace Microsoft.Interop
{
 public readonly record struct ContainingSyntax(SyntaxTokenList Modifiers, SyntaxKind TypeKind, SyntaxToken Identifier, TypeParameterListSyntax? TypeParameters)
 public readonly struct ContainingSyntax(SyntaxTokenList modifiers, SyntaxKind typeKind, SyntaxToken identifier, TypeParameterListSyntax? typeParameters) : IEquatable<ContainingSyntax>
 {
 public SyntaxTokenList Modifiers { get; init; } = modifiers.StripTriviaFromTokens();

 public SyntaxToken Identifier { get; init; } = identifier.WithoutTrivia();

 public SyntaxKind TypeKind { get; init; } = typeKind;

 public TypeParameterListSyntax? TypeParameters { get; init; } = typeParameters;

 public override bool Equals(object obj) => obj is ContainingSyntax other && Equals(other);

 public bool Equals(ContainingSyntax other)
 {
 return Modifiers.SequenceEqual(other.Modifiers, SyntaxEquivalentComparer.Instance)
Expand DownExpand Up@@ -42,8 +52,12 @@ private static ImmutableArray<ContainingSyntax> GetContainingTypes(MemberDeclara
 ImmutableArray<ContainingSyntax>.Builder containingTypeInfoBuilder = ImmutableArray.CreateBuilder<ContainingSyntax>();
 for (SyntaxNode? parent = memberDeclaration.Parent; parent is TypeDeclarationSyntax typeDeclaration; parent = parent.Parent)
 {
 containingTypeInfoBuilder.Add(new ContainingSyntax(typeDeclaration.Modifiers.StripTriviaFromTokens(), typeDeclaration.Kind(), typeDeclaration.Identifier.WithoutTrivia(),
 typeDeclaration.TypeParameterList));
 containingTypeInfoBuilder.Add(
 new ContainingSyntax(
 typeDeclaration.Modifiers,
 typeDeclaration.Kind(),
 typeDeclaration.Identifier,
 typeDeclaration.TypeParameterList));
 }

 return containingTypeInfoBuilder.ToImmutable();
Expand Down

53 changes: 14 additions & 39 deletions
...ies/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Unit.Tests/CompileFails.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -558,69 +558,45 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnValueTypes()

 // [In] is default for all non-pinned marshalled types
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute, "byte", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + "[MarshalAs(UnmanagedType.U2)]", "char", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };

 // [Out] is not allowed on value types passed by value - there is no indirection for the callee to make visible modifications.
 var outAttributeNotSupportedOnValueParameters = new DiagnosticResult(GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails)
 .WithLocation(0)
 .WithArguments(SR.OutAttributeNotSupportedOnByValueParameters, paramName);
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters } };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(outAttribute, "IntStruct", paramNameWithLocation) + CodeSnippets.IntStructAndMarshaller,
 new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters,
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute, "[MarshalAs(UnmanagedType.U2)] char", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };
 // [In,Out] should only warn for Out attribute
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute+outAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters } };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute+outAttribute, "IntStruct", paramNameWithLocation) + CodeSnippets.IntStructAndMarshaller,
 new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters,
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute, "[MarshalAs(UnmanagedType.U2)] char", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };

Expand DownExpand Up@@ -688,12 +664,12 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnReferenceTypes()
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute, "string", paramNameWithLocation, (StringMarshalling.Utf8, null)),
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic }
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic }
 };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic }
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic }
 };

 var outNotAllowedOnRefTypes = new DiagnosticResult(GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails)
Expand All@@ -704,21 +680,21 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnReferenceTypes()
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(outAttribute, "string", paramNameWithLocation, (StringMarshalling.Utf8, null)),
 new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
 new DiagnosticResult[] { outNotAllowedOnRefTypes }
 };

 // [Out] warns on by value reference types
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(outAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
 new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
 new DiagnosticResult[] { outNotAllowedOnRefTypes }
 };

 // [In,Out] is fine on classes
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
 new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
 new DiagnosticResult[] { outNotAllowedOnRefTypes }
 };

 // All refkinds are okay on classes and strings
Expand DownExpand Up@@ -774,11 +750,10 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
 .WithLocation(0)
 .WithArguments(SR.InAttributeOnlyNotSupportedOnPinnedParameters, paramName);
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + constElementCount, "int[]", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeNotSupportedOnPinnedParameter,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeNotSupportedOnPinnedParameter
 }};
 // new issue before merge: char generated code doesn't seem to work well with [In, Out]
 // blittable arrays don't support [In] only. Different diagnostics are issued because we can pin in one direction (managed->unmanaged)
 // but not the other direction.
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + constElementCount, "char[]", paramNameWithLocation, (StringMarshalling.Utf16, null)),
Expand All@@ -793,13 +768,13 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
 "bool[]",
 paramNameWithLocation,
 (StringMarshalling.Utf16, null)),
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic}
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic}
 };
 // Overriding marshalling with a custom marshaller makes it not pinned
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute, "[MarshalUsing(typeof(IntMarshaller), ElementIndirectionDepth = 1), MarshalUsing(ConstantElementCount = 10)]int[]", paramNameWithLocation) + CodeSnippets.IntMarshaller,
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic}
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic}
 };

 // [In, Out] is default
Expand All@@ -811,12 +786,12 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + constElementCount, "int[]", paramNameWithLocation),
 new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic, inOutAttributeIsDefaultDiagnostic}
 new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic}
 };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + constElementCount, "char[]", paramNameWithLocation, (StringMarshalling.Utf16, null)),
 //https://github.com/dotnet/runtime/issues/88540
 //https://github.com/dotnet/runtime/issues/88708
 new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic }
 };

Expand DownExpand Up@@ -847,7 +822,7 @@ public async Task VerifyByValueMarshallingAttributeUsage(string id, string sourc
 {
 TestCode = source,
 TestBehaviors = TestBehaviors.SkipGeneratedSourcesCheck,
 // Our fallback mechanism for invalid code for unmanaged->managed stubs sometimes generates invalid code.
 // https://github.com/dotnet/runtime/issues/88708
 CompilerDiagnostics = diagnostics.Length != 0 ? CompilerDiagnostics.None : CompilerDiagnostics.Errors,
 };
 test.ExpectedDiagnostics.AddRange(diagnostics);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Strip trivia from tokens.#88856

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 6 commits into

from

Jul 14, 2023
 Merged


Strip trivia from tokens.
#88856
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
a17cffe

Strip trivia from tokens.


jkoritzinsky Jul 13, 2023
55ff5d8

Move the trivia stripping into ContainingSyntax record constructor


jkoritzinsky Jul 13, 2023
7808204

Make ContainingSyntax a regular struct with a primary constructor ins…


jkoritzinsky Jul 13, 2023
9deb8a7

Merge branch 'trivia' of github.com:jkoritzinsky/runtime; branch 'mai…


jkoritzinsky Jul 13, 2023
d42fc74

Fix #88867


jkoritzinsky Jul 13, 2023
0a7b306

Suppress compiler diagnostics based on the linked issue.


jkoritzinsky Jul 13, 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


2 changes: 1 addition & 1 deletion
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSExportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -206,7 +206,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

 var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);

 return new IncrementalStubGenerationContext(
 signatureContext,
Expand Down

2 changes: 1 addition & 1 deletion
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSImportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -194,7 +194,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

 var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 return new IncrementalStubGenerationContext(
 signatureContext,
 containingTypeContext,
Expand Down

2 changes: 1 addition & 1 deletion
...braries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComInterfaceGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -306,7 +306,7 @@ private static IncrementalMethodStubGenerationContext CalculateStubInformation(M

 var containingSyntaxContext = new ContainingSyntaxContext(syntax);

 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers().StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);

 ImmutableArray<FunctionPointerUnmanagedCallingConventionSyntax> callConv = VirtualMethodPointerStubGenerator.GenerateCallConvSyntaxFromAttributes(
 suppressGCTransitionAttribute,
Expand Down

2 changes: 1 addition & 1 deletion
...ries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/VtableIndexStubGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -278,7 +278,7 @@ private static IncrementalMethodStubGenerationContext CalculateStubInformation(M

 var containingSyntaxContext = new ContainingSyntaxContext(syntax);

 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers().StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);

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

Expand Down

2 changes: 1 addition & 1 deletion
...aries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -288,7 +288,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

 var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);

 List<AttributeSyntax> additionalAttributes = GenerateSyntaxForForwardedAttributes(suppressGCTransitionAttribute, unmanagedCallConvAttribute, defaultDllImportSearchPathsAttribute);
 return new IncrementalStubGenerationContext(
Expand Down

20 changes: 17 additions & 3 deletions
...Runtime.InteropServices/gen/Microsoft.Interop.SourceGeneration/ContainingSyntaxContext.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,18 @@

namespace Microsoft.Interop
{
 public readonly record struct ContainingSyntax(SyntaxTokenList Modifiers, SyntaxKind TypeKind, SyntaxToken Identifier, TypeParameterListSyntax? TypeParameters)
 public readonly struct ContainingSyntax(SyntaxTokenList modifiers, SyntaxKind typeKind, SyntaxToken identifier, TypeParameterListSyntax? typeParameters) : IEquatable<ContainingSyntax>
 {
 public SyntaxTokenList Modifiers { get; init; } = modifiers.StripTriviaFromTokens();

 public SyntaxToken Identifier { get; init; } = identifier.WithoutTrivia();

 public SyntaxKind TypeKind { get; init; } = typeKind;

 public TypeParameterListSyntax? TypeParameters { get; init; } = typeParameters;

 public override bool Equals(object obj) => obj is ContainingSyntax other && Equals(other);

 public bool Equals(ContainingSyntax other)
 {
 return Modifiers.SequenceEqual(other.Modifiers, SyntaxEquivalentComparer.Instance)
Expand DownExpand Up@@ -42,8 +52,12 @@ private static ImmutableArray<ContainingSyntax> GetContainingTypes(MemberDeclara
 ImmutableArray<ContainingSyntax>.Builder containingTypeInfoBuilder = ImmutableArray.CreateBuilder<ContainingSyntax>();
 for (SyntaxNode? parent = memberDeclaration.Parent; parent is TypeDeclarationSyntax typeDeclaration; parent = parent.Parent)
 {
 containingTypeInfoBuilder.Add(new ContainingSyntax(typeDeclaration.Modifiers.StripTriviaFromTokens(), typeDeclaration.Kind(), typeDeclaration.Identifier.WithoutTrivia(),
 typeDeclaration.TypeParameterList));
 containingTypeInfoBuilder.Add(
 new ContainingSyntax(
 typeDeclaration.Modifiers,
 typeDeclaration.Kind(),
 typeDeclaration.Identifier,
 typeDeclaration.TypeParameterList));
 }

 return containingTypeInfoBuilder.ToImmutable();
Expand Down

53 changes: 14 additions & 39 deletions
...ies/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Unit.Tests/CompileFails.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -558,69 +558,45 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnValueTypes()

 // [In] is default for all non-pinned marshalled types
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute, "byte", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + "[MarshalAs(UnmanagedType.U2)]", "char", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };

 // [Out] is not allowed on value types passed by value - there is no indirection for the callee to make visible modifications.
 var outAttributeNotSupportedOnValueParameters = new DiagnosticResult(GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails)
 .WithLocation(0)
 .WithArguments(SR.OutAttributeNotSupportedOnByValueParameters, paramName);
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters } };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(outAttribute, "IntStruct", paramNameWithLocation) + CodeSnippets.IntStructAndMarshaller,
 new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters,
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute, "[MarshalAs(UnmanagedType.U2)] char", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };
 // [In,Out] should only warn for Out attribute
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute+outAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters } };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute+outAttribute, "IntStruct", paramNameWithLocation) + CodeSnippets.IntStructAndMarshaller,
 new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters,
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute, "[MarshalAs(UnmanagedType.U2)] char", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };

Expand DownExpand Up@@ -688,12 +664,12 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnReferenceTypes()
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute, "string", paramNameWithLocation, (StringMarshalling.Utf8, null)),
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic }
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic }
 };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic }
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic }
 };

 var outNotAllowedOnRefTypes = new DiagnosticResult(GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails)
Expand All@@ -704,21 +680,21 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnReferenceTypes()
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(outAttribute, "string", paramNameWithLocation, (StringMarshalling.Utf8, null)),
 new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
 new DiagnosticResult[] { outNotAllowedOnRefTypes }
 };

 // [Out] warns on by value reference types
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(outAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
 new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
 new DiagnosticResult[] { outNotAllowedOnRefTypes }
 };

 // [In,Out] is fine on classes
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
 new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
 new DiagnosticResult[] { outNotAllowedOnRefTypes }
 };

 // All refkinds are okay on classes and strings
Expand DownExpand Up@@ -774,11 +750,10 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
 .WithLocation(0)
 .WithArguments(SR.InAttributeOnlyNotSupportedOnPinnedParameters, paramName);
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + constElementCount, "int[]", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeNotSupportedOnPinnedParameter,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeNotSupportedOnPinnedParameter
 }};
 // new issue before merge: char generated code doesn't seem to work well with [In, Out]
 // blittable arrays don't support [In] only. Different diagnostics are issued because we can pin in one direction (managed->unmanaged)
 // but not the other direction.
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + constElementCount, "char[]", paramNameWithLocation, (StringMarshalling.Utf16, null)),
Expand All@@ -793,13 +768,13 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
 "bool[]",
 paramNameWithLocation,
 (StringMarshalling.Utf16, null)),
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic}
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic}
 };
 // Overriding marshalling with a custom marshaller makes it not pinned
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute, "[MarshalUsing(typeof(IntMarshaller), ElementIndirectionDepth = 1), MarshalUsing(ConstantElementCount = 10)]int[]", paramNameWithLocation) + CodeSnippets.IntMarshaller,
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic}
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic}
 };

 // [In, Out] is default
Expand All@@ -811,12 +786,12 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + constElementCount, "int[]", paramNameWithLocation),
 new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic, inOutAttributeIsDefaultDiagnostic}
 new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic}
 };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + constElementCount, "char[]", paramNameWithLocation, (StringMarshalling.Utf16, null)),
 //https://github.com/dotnet/runtime/issues/88540
 //https://github.com/dotnet/runtime/issues/88708
 new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic }
 };

Expand DownExpand Up@@ -847,7 +822,7 @@ public async Task VerifyByValueMarshallingAttributeUsage(string id, string sourc
 {
 TestCode = source,
 TestBehaviors = TestBehaviors.SkipGeneratedSourcesCheck,
 // Our fallback mechanism for invalid code for unmanaged->managed stubs sometimes generates invalid code.
 // https://github.com/dotnet/runtime/issues/88708
 CompilerDiagnostics = diagnostics.Length != 0 ? CompilerDiagnostics.None : CompilerDiagnostics.Errors,
 };
 test.ExpectedDiagnostics.AddRange(diagnostics);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Strip trivia from tokens.#88856

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 6 commits into

from

Jul 14, 2023
 Merged


Strip trivia from tokens.
#88856
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
a17cffe

Strip trivia from tokens.


jkoritzinsky Jul 13, 2023
55ff5d8

Move the trivia stripping into ContainingSyntax record constructor


jkoritzinsky Jul 13, 2023
7808204

Make ContainingSyntax a regular struct with a primary constructor ins…


jkoritzinsky Jul 13, 2023
9deb8a7

Merge branch 'trivia' of github.com:jkoritzinsky/runtime; branch 'mai…


jkoritzinsky Jul 13, 2023
d42fc74

Fix #88867


jkoritzinsky Jul 13, 2023
0a7b306

Suppress compiler diagnostics based on the linked issue.


jkoritzinsky Jul 13, 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


2 changes: 1 addition & 1 deletion
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSExportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -206,7 +206,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

 var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);

 return new IncrementalStubGenerationContext(
 signatureContext,
Expand Down

2 changes: 1 addition & 1 deletion
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSImportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -194,7 +194,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

 var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 return new IncrementalStubGenerationContext(
 signatureContext,
 containingTypeContext,
Expand Down

2 changes: 1 addition & 1 deletion
...braries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComInterfaceGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -306,7 +306,7 @@ private static IncrementalMethodStubGenerationContext CalculateStubInformation(M

 var containingSyntaxContext = new ContainingSyntaxContext(syntax);

 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers().StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);

 ImmutableArray<FunctionPointerUnmanagedCallingConventionSyntax> callConv = VirtualMethodPointerStubGenerator.GenerateCallConvSyntaxFromAttributes(
 suppressGCTransitionAttribute,
Expand Down

2 changes: 1 addition & 1 deletion
...ries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/VtableIndexStubGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -278,7 +278,7 @@ private static IncrementalMethodStubGenerationContext CalculateStubInformation(M

 var containingSyntaxContext = new ContainingSyntaxContext(syntax);

 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers().StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);

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

Expand Down

2 changes: 1 addition & 1 deletion
...aries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -288,7 +288,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

 var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);

 List<AttributeSyntax> additionalAttributes = GenerateSyntaxForForwardedAttributes(suppressGCTransitionAttribute, unmanagedCallConvAttribute, defaultDllImportSearchPathsAttribute);
 return new IncrementalStubGenerationContext(
Expand Down

20 changes: 17 additions & 3 deletions
...Runtime.InteropServices/gen/Microsoft.Interop.SourceGeneration/ContainingSyntaxContext.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,18 @@

namespace Microsoft.Interop
{
 public readonly record struct ContainingSyntax(SyntaxTokenList Modifiers, SyntaxKind TypeKind, SyntaxToken Identifier, TypeParameterListSyntax? TypeParameters)
 public readonly struct ContainingSyntax(SyntaxTokenList modifiers, SyntaxKind typeKind, SyntaxToken identifier, TypeParameterListSyntax? typeParameters) : IEquatable<ContainingSyntax>
 {
 public SyntaxTokenList Modifiers { get; init; } = modifiers.StripTriviaFromTokens();

 public SyntaxToken Identifier { get; init; } = identifier.WithoutTrivia();

 public SyntaxKind TypeKind { get; init; } = typeKind;

 public TypeParameterListSyntax? TypeParameters { get; init; } = typeParameters;

 public override bool Equals(object obj) => obj is ContainingSyntax other && Equals(other);

 public bool Equals(ContainingSyntax other)
 {
 return Modifiers.SequenceEqual(other.Modifiers, SyntaxEquivalentComparer.Instance)
Expand DownExpand Up@@ -42,8 +52,12 @@ private static ImmutableArray<ContainingSyntax> GetContainingTypes(MemberDeclara
 ImmutableArray<ContainingSyntax>.Builder containingTypeInfoBuilder = ImmutableArray.CreateBuilder<ContainingSyntax>();
 for (SyntaxNode? parent = memberDeclaration.Parent; parent is TypeDeclarationSyntax typeDeclaration; parent = parent.Parent)
 {
 containingTypeInfoBuilder.Add(new ContainingSyntax(typeDeclaration.Modifiers.StripTriviaFromTokens(), typeDeclaration.Kind(), typeDeclaration.Identifier.WithoutTrivia(),
 typeDeclaration.TypeParameterList));
 containingTypeInfoBuilder.Add(
 new ContainingSyntax(
 typeDeclaration.Modifiers,
 typeDeclaration.Kind(),
 typeDeclaration.Identifier,
 typeDeclaration.TypeParameterList));
 }

 return containingTypeInfoBuilder.ToImmutable();
Expand Down

53 changes: 14 additions & 39 deletions
...ies/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Unit.Tests/CompileFails.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -558,69 +558,45 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnValueTypes()

 // [In] is default for all non-pinned marshalled types
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute, "byte", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + "[MarshalAs(UnmanagedType.U2)]", "char", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };

 // [Out] is not allowed on value types passed by value - there is no indirection for the callee to make visible modifications.
 var outAttributeNotSupportedOnValueParameters = new DiagnosticResult(GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails)
 .WithLocation(0)
 .WithArguments(SR.OutAttributeNotSupportedOnByValueParameters, paramName);
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters } };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(outAttribute, "IntStruct", paramNameWithLocation) + CodeSnippets.IntStructAndMarshaller,
 new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters,
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute, "[MarshalAs(UnmanagedType.U2)] char", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };
 // [In,Out] should only warn for Out attribute
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute+outAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters } };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute+outAttribute, "IntStruct", paramNameWithLocation) + CodeSnippets.IntStructAndMarshaller,
 new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters,
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute, "[MarshalAs(UnmanagedType.U2)] char", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };

Expand DownExpand Up@@ -688,12 +664,12 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnReferenceTypes()
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute, "string", paramNameWithLocation, (StringMarshalling.Utf8, null)),
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic }
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic }
 };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic }
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic }
 };

 var outNotAllowedOnRefTypes = new DiagnosticResult(GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails)
Expand All@@ -704,21 +680,21 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnReferenceTypes()
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(outAttribute, "string", paramNameWithLocation, (StringMarshalling.Utf8, null)),
 new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
 new DiagnosticResult[] { outNotAllowedOnRefTypes }
 };

 // [Out] warns on by value reference types
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(outAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
 new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
 new DiagnosticResult[] { outNotAllowedOnRefTypes }
 };

 // [In,Out] is fine on classes
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
 new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
 new DiagnosticResult[] { outNotAllowedOnRefTypes }
 };

 // All refkinds are okay on classes and strings
Expand DownExpand Up@@ -774,11 +750,10 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
 .WithLocation(0)
 .WithArguments(SR.InAttributeOnlyNotSupportedOnPinnedParameters, paramName);
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + constElementCount, "int[]", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeNotSupportedOnPinnedParameter,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeNotSupportedOnPinnedParameter
 }};
 // new issue before merge: char generated code doesn't seem to work well with [In, Out]
 // blittable arrays don't support [In] only. Different diagnostics are issued because we can pin in one direction (managed->unmanaged)
 // but not the other direction.
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + constElementCount, "char[]", paramNameWithLocation, (StringMarshalling.Utf16, null)),
Expand All@@ -793,13 +768,13 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
 "bool[]",
 paramNameWithLocation,
 (StringMarshalling.Utf16, null)),
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic}
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic}
 };
 // Overriding marshalling with a custom marshaller makes it not pinned
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute, "[MarshalUsing(typeof(IntMarshaller), ElementIndirectionDepth = 1), MarshalUsing(ConstantElementCount = 10)]int[]", paramNameWithLocation) + CodeSnippets.IntMarshaller,
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic}
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic}
 };

 // [In, Out] is default
Expand All@@ -811,12 +786,12 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + constElementCount, "int[]", paramNameWithLocation),
 new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic, inOutAttributeIsDefaultDiagnostic}
 new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic}
 };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + constElementCount, "char[]", paramNameWithLocation, (StringMarshalling.Utf16, null)),
 //https://github.com/dotnet/runtime/issues/88540
 //https://github.com/dotnet/runtime/issues/88708
 new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic }
 };

Expand DownExpand Up@@ -847,7 +822,7 @@ public async Task VerifyByValueMarshallingAttributeUsage(string id, string sourc
 {
 TestCode = source,
 TestBehaviors = TestBehaviors.SkipGeneratedSourcesCheck,
 // Our fallback mechanism for invalid code for unmanaged->managed stubs sometimes generates invalid code.
 // https://github.com/dotnet/runtime/issues/88708
 CompilerDiagnostics = diagnostics.Length != 0 ? CompilerDiagnostics.None : CompilerDiagnostics.Errors,
 };
 test.ExpectedDiagnostics.AddRange(diagnostics);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Strip trivia from tokens.#88856

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 6 commits into

from

Jul 14, 2023
 Merged


Strip trivia from tokens.
#88856
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
a17cffe

Strip trivia from tokens.


jkoritzinsky Jul 13, 2023
55ff5d8

Move the trivia stripping into ContainingSyntax record constructor


jkoritzinsky Jul 13, 2023
7808204

Make ContainingSyntax a regular struct with a primary constructor ins…


jkoritzinsky Jul 13, 2023
9deb8a7

Merge branch 'trivia' of github.com:jkoritzinsky/runtime; branch 'mai…


jkoritzinsky Jul 13, 2023
d42fc74

Fix #88867


jkoritzinsky Jul 13, 2023
0a7b306

Suppress compiler diagnostics based on the linked issue.


jkoritzinsky Jul 13, 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


2 changes: 1 addition & 1 deletion
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSExportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -206,7 +206,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

 var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);

 return new IncrementalStubGenerationContext(
 signatureContext,
Expand Down

2 changes: 1 addition & 1 deletion
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSImportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -194,7 +194,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

 var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 return new IncrementalStubGenerationContext(
 signatureContext,
 containingTypeContext,
Expand Down

2 changes: 1 addition & 1 deletion
...braries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComInterfaceGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -306,7 +306,7 @@ private static IncrementalMethodStubGenerationContext CalculateStubInformation(M

 var containingSyntaxContext = new ContainingSyntaxContext(syntax);

 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers().StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);

 ImmutableArray<FunctionPointerUnmanagedCallingConventionSyntax> callConv = VirtualMethodPointerStubGenerator.GenerateCallConvSyntaxFromAttributes(
 suppressGCTransitionAttribute,
Expand Down

2 changes: 1 addition & 1 deletion
...ries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/VtableIndexStubGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -278,7 +278,7 @@ private static IncrementalMethodStubGenerationContext CalculateStubInformation(M

 var containingSyntaxContext = new ContainingSyntaxContext(syntax);

 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers().StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);

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

Expand Down

2 changes: 1 addition & 1 deletion
...aries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -288,7 +288,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

 var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);

 List<AttributeSyntax> additionalAttributes = GenerateSyntaxForForwardedAttributes(suppressGCTransitionAttribute, unmanagedCallConvAttribute, defaultDllImportSearchPathsAttribute);
 return new IncrementalStubGenerationContext(
Expand Down

20 changes: 17 additions & 3 deletions
...Runtime.InteropServices/gen/Microsoft.Interop.SourceGeneration/ContainingSyntaxContext.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,18 @@

namespace Microsoft.Interop
{
 public readonly record struct ContainingSyntax(SyntaxTokenList Modifiers, SyntaxKind TypeKind, SyntaxToken Identifier, TypeParameterListSyntax? TypeParameters)
 public readonly struct ContainingSyntax(SyntaxTokenList modifiers, SyntaxKind typeKind, SyntaxToken identifier, TypeParameterListSyntax? typeParameters) : IEquatable<ContainingSyntax>
 {
 public SyntaxTokenList Modifiers { get; init; } = modifiers.StripTriviaFromTokens();

 public SyntaxToken Identifier { get; init; } = identifier.WithoutTrivia();

 public SyntaxKind TypeKind { get; init; } = typeKind;

 public TypeParameterListSyntax? TypeParameters { get; init; } = typeParameters;

 public override bool Equals(object obj) => obj is ContainingSyntax other && Equals(other);

 public bool Equals(ContainingSyntax other)
 {
 return Modifiers.SequenceEqual(other.Modifiers, SyntaxEquivalentComparer.Instance)
Expand DownExpand Up@@ -42,8 +52,12 @@ private static ImmutableArray<ContainingSyntax> GetContainingTypes(MemberDeclara
 ImmutableArray<ContainingSyntax>.Builder containingTypeInfoBuilder = ImmutableArray.CreateBuilder<ContainingSyntax>();
 for (SyntaxNode? parent = memberDeclaration.Parent; parent is TypeDeclarationSyntax typeDeclaration; parent = parent.Parent)
 {
 containingTypeInfoBuilder.Add(new ContainingSyntax(typeDeclaration.Modifiers.StripTriviaFromTokens(), typeDeclaration.Kind(), typeDeclaration.Identifier.WithoutTrivia(),
 typeDeclaration.TypeParameterList));
 containingTypeInfoBuilder.Add(
 new ContainingSyntax(
 typeDeclaration.Modifiers,
 typeDeclaration.Kind(),
 typeDeclaration.Identifier,
 typeDeclaration.TypeParameterList));
 }

 return containingTypeInfoBuilder.ToImmutable();
Expand Down

53 changes: 14 additions & 39 deletions
...ies/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Unit.Tests/CompileFails.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -558,69 +558,45 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnValueTypes()

 // [In] is default for all non-pinned marshalled types
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute, "byte", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + "[MarshalAs(UnmanagedType.U2)]", "char", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };

 // [Out] is not allowed on value types passed by value - there is no indirection for the callee to make visible modifications.
 var outAttributeNotSupportedOnValueParameters = new DiagnosticResult(GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails)
 .WithLocation(0)
 .WithArguments(SR.OutAttributeNotSupportedOnByValueParameters, paramName);
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters } };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(outAttribute, "IntStruct", paramNameWithLocation) + CodeSnippets.IntStructAndMarshaller,
 new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters,
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute, "[MarshalAs(UnmanagedType.U2)] char", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };
 // [In,Out] should only warn for Out attribute
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute+outAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters } };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute+outAttribute, "IntStruct", paramNameWithLocation) + CodeSnippets.IntStructAndMarshaller,
 new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters,
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute, "[MarshalAs(UnmanagedType.U2)] char", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };

Expand DownExpand Up@@ -688,12 +664,12 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnReferenceTypes()
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute, "string", paramNameWithLocation, (StringMarshalling.Utf8, null)),
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic }
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic }
 };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic }
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic }
 };

 var outNotAllowedOnRefTypes = new DiagnosticResult(GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails)
Expand All@@ -704,21 +680,21 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnReferenceTypes()
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(outAttribute, "string", paramNameWithLocation, (StringMarshalling.Utf8, null)),
 new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
 new DiagnosticResult[] { outNotAllowedOnRefTypes }
 };

 // [Out] warns on by value reference types
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(outAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
 new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
 new DiagnosticResult[] { outNotAllowedOnRefTypes }
 };

 // [In,Out] is fine on classes
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
 new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
 new DiagnosticResult[] { outNotAllowedOnRefTypes }
 };

 // All refkinds are okay on classes and strings
Expand DownExpand Up@@ -774,11 +750,10 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
 .WithLocation(0)
 .WithArguments(SR.InAttributeOnlyNotSupportedOnPinnedParameters, paramName);
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + constElementCount, "int[]", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeNotSupportedOnPinnedParameter,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeNotSupportedOnPinnedParameter
 }};
 // new issue before merge: char generated code doesn't seem to work well with [In, Out]
 // blittable arrays don't support [In] only. Different diagnostics are issued because we can pin in one direction (managed->unmanaged)
 // but not the other direction.
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + constElementCount, "char[]", paramNameWithLocation, (StringMarshalling.Utf16, null)),
Expand All@@ -793,13 +768,13 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
 "bool[]",
 paramNameWithLocation,
 (StringMarshalling.Utf16, null)),
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic}
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic}
 };
 // Overriding marshalling with a custom marshaller makes it not pinned
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute, "[MarshalUsing(typeof(IntMarshaller), ElementIndirectionDepth = 1), MarshalUsing(ConstantElementCount = 10)]int[]", paramNameWithLocation) + CodeSnippets.IntMarshaller,
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic}
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic}
 };

 // [In, Out] is default
Expand All@@ -811,12 +786,12 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + constElementCount, "int[]", paramNameWithLocation),
 new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic, inOutAttributeIsDefaultDiagnostic}
 new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic}
 };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + constElementCount, "char[]", paramNameWithLocation, (StringMarshalling.Utf16, null)),
 //https://github.com/dotnet/runtime/issues/88540
 //https://github.com/dotnet/runtime/issues/88708
 new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic }
 };

Expand DownExpand Up@@ -847,7 +822,7 @@ public async Task VerifyByValueMarshallingAttributeUsage(string id, string sourc
 {
 TestCode = source,
 TestBehaviors = TestBehaviors.SkipGeneratedSourcesCheck,
 // Our fallback mechanism for invalid code for unmanaged->managed stubs sometimes generates invalid code.
 // https://github.com/dotnet/runtime/issues/88708
 CompilerDiagnostics = diagnostics.Length != 0 ? CompilerDiagnostics.None : CompilerDiagnostics.Errors,
 };
 test.ExpectedDiagnostics.AddRange(diagnostics);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Strip trivia from tokens.#88856

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 6 commits into

from

Jul 14, 2023
 Merged


Strip trivia from tokens.
#88856
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
a17cffe

Strip trivia from tokens.


jkoritzinsky Jul 13, 2023
55ff5d8

Move the trivia stripping into ContainingSyntax record constructor


jkoritzinsky Jul 13, 2023
7808204

Make ContainingSyntax a regular struct with a primary constructor ins…


jkoritzinsky Jul 13, 2023
9deb8a7

Merge branch 'trivia' of github.com:jkoritzinsky/runtime; branch 'mai…


jkoritzinsky Jul 13, 2023
d42fc74

Fix #88867


jkoritzinsky Jul 13, 2023
0a7b306

Suppress compiler diagnostics based on the linked issue.


jkoritzinsky Jul 13, 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


2 changes: 1 addition & 1 deletion
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSExportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -206,7 +206,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

 var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);

 return new IncrementalStubGenerationContext(
 signatureContext,
Expand Down

2 changes: 1 addition & 1 deletion
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSImportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -194,7 +194,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

 var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 return new IncrementalStubGenerationContext(
 signatureContext,
 containingTypeContext,
Expand Down

2 changes: 1 addition & 1 deletion
...braries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComInterfaceGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -306,7 +306,7 @@ private static IncrementalMethodStubGenerationContext CalculateStubInformation(M

 var containingSyntaxContext = new ContainingSyntaxContext(syntax);

 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers().StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);

 ImmutableArray<FunctionPointerUnmanagedCallingConventionSyntax> callConv = VirtualMethodPointerStubGenerator.GenerateCallConvSyntaxFromAttributes(
 suppressGCTransitionAttribute,
Expand Down

2 changes: 1 addition & 1 deletion
...ries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/VtableIndexStubGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -278,7 +278,7 @@ private static IncrementalMethodStubGenerationContext CalculateStubInformation(M

 var containingSyntaxContext = new ContainingSyntaxContext(syntax);

 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers().StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);

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

Expand Down

2 changes: 1 addition & 1 deletion
...aries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -288,7 +288,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

 var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);

 List<AttributeSyntax> additionalAttributes = GenerateSyntaxForForwardedAttributes(suppressGCTransitionAttribute, unmanagedCallConvAttribute, defaultDllImportSearchPathsAttribute);
 return new IncrementalStubGenerationContext(
Expand Down

20 changes: 17 additions & 3 deletions
...Runtime.InteropServices/gen/Microsoft.Interop.SourceGeneration/ContainingSyntaxContext.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,18 @@

namespace Microsoft.Interop
{
 public readonly record struct ContainingSyntax(SyntaxTokenList Modifiers, SyntaxKind TypeKind, SyntaxToken Identifier, TypeParameterListSyntax? TypeParameters)
 public readonly struct ContainingSyntax(SyntaxTokenList modifiers, SyntaxKind typeKind, SyntaxToken identifier, TypeParameterListSyntax? typeParameters) : IEquatable<ContainingSyntax>
 {
 public SyntaxTokenList Modifiers { get; init; } = modifiers.StripTriviaFromTokens();

 public SyntaxToken Identifier { get; init; } = identifier.WithoutTrivia();

 public SyntaxKind TypeKind { get; init; } = typeKind;

 public TypeParameterListSyntax? TypeParameters { get; init; } = typeParameters;

 public override bool Equals(object obj) => obj is ContainingSyntax other && Equals(other);

 public bool Equals(ContainingSyntax other)
 {
 return Modifiers.SequenceEqual(other.Modifiers, SyntaxEquivalentComparer.Instance)
Expand DownExpand Up@@ -42,8 +52,12 @@ private static ImmutableArray<ContainingSyntax> GetContainingTypes(MemberDeclara
 ImmutableArray<ContainingSyntax>.Builder containingTypeInfoBuilder = ImmutableArray.CreateBuilder<ContainingSyntax>();
 for (SyntaxNode? parent = memberDeclaration.Parent; parent is TypeDeclarationSyntax typeDeclaration; parent = parent.Parent)
 {
 containingTypeInfoBuilder.Add(new ContainingSyntax(typeDeclaration.Modifiers.StripTriviaFromTokens(), typeDeclaration.Kind(), typeDeclaration.Identifier.WithoutTrivia(),
 typeDeclaration.TypeParameterList));
 containingTypeInfoBuilder.Add(
 new ContainingSyntax(
 typeDeclaration.Modifiers,
 typeDeclaration.Kind(),
 typeDeclaration.Identifier,
 typeDeclaration.TypeParameterList));
 }

 return containingTypeInfoBuilder.ToImmutable();
Expand Down

53 changes: 14 additions & 39 deletions
...ies/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Unit.Tests/CompileFails.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -558,69 +558,45 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnValueTypes()

 // [In] is default for all non-pinned marshalled types
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute, "byte", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + "[MarshalAs(UnmanagedType.U2)]", "char", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };

 // [Out] is not allowed on value types passed by value - there is no indirection for the callee to make visible modifications.
 var outAttributeNotSupportedOnValueParameters = new DiagnosticResult(GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails)
 .WithLocation(0)
 .WithArguments(SR.OutAttributeNotSupportedOnByValueParameters, paramName);
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters } };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(outAttribute, "IntStruct", paramNameWithLocation) + CodeSnippets.IntStructAndMarshaller,
 new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters,
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute, "[MarshalAs(UnmanagedType.U2)] char", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };
 // [In,Out] should only warn for Out attribute
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute+outAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters } };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute+outAttribute, "IntStruct", paramNameWithLocation) + CodeSnippets.IntStructAndMarshaller,
 new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters,
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute, "[MarshalAs(UnmanagedType.U2)] char", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };

Expand DownExpand Up@@ -688,12 +664,12 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnReferenceTypes()
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute, "string", paramNameWithLocation, (StringMarshalling.Utf8, null)),
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic }
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic }
 };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic }
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic }
 };

 var outNotAllowedOnRefTypes = new DiagnosticResult(GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails)
Expand All@@ -704,21 +680,21 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnReferenceTypes()
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(outAttribute, "string", paramNameWithLocation, (StringMarshalling.Utf8, null)),
 new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
 new DiagnosticResult[] { outNotAllowedOnRefTypes }
 };

 // [Out] warns on by value reference types
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(outAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
 new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
 new DiagnosticResult[] { outNotAllowedOnRefTypes }
 };

 // [In,Out] is fine on classes
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
 new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
 new DiagnosticResult[] { outNotAllowedOnRefTypes }
 };

 // All refkinds are okay on classes and strings
Expand DownExpand Up@@ -774,11 +750,10 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
 .WithLocation(0)
 .WithArguments(SR.InAttributeOnlyNotSupportedOnPinnedParameters, paramName);
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + constElementCount, "int[]", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeNotSupportedOnPinnedParameter,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeNotSupportedOnPinnedParameter
 }};
 // new issue before merge: char generated code doesn't seem to work well with [In, Out]
 // blittable arrays don't support [In] only. Different diagnostics are issued because we can pin in one direction (managed->unmanaged)
 // but not the other direction.
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + constElementCount, "char[]", paramNameWithLocation, (StringMarshalling.Utf16, null)),
Expand All@@ -793,13 +768,13 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
 "bool[]",
 paramNameWithLocation,
 (StringMarshalling.Utf16, null)),
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic}
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic}
 };
 // Overriding marshalling with a custom marshaller makes it not pinned
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute, "[MarshalUsing(typeof(IntMarshaller), ElementIndirectionDepth = 1), MarshalUsing(ConstantElementCount = 10)]int[]", paramNameWithLocation) + CodeSnippets.IntMarshaller,
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic}
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic}
 };

 // [In, Out] is default
Expand All@@ -811,12 +786,12 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + constElementCount, "int[]", paramNameWithLocation),
 new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic, inOutAttributeIsDefaultDiagnostic}
 new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic}
 };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + constElementCount, "char[]", paramNameWithLocation, (StringMarshalling.Utf16, null)),
 //https://github.com/dotnet/runtime/issues/88540
 //https://github.com/dotnet/runtime/issues/88708
 new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic }
 };

Expand DownExpand Up@@ -847,7 +822,7 @@ public async Task VerifyByValueMarshallingAttributeUsage(string id, string sourc
 {
 TestCode = source,
 TestBehaviors = TestBehaviors.SkipGeneratedSourcesCheck,
 // Our fallback mechanism for invalid code for unmanaged->managed stubs sometimes generates invalid code.
 // https://github.com/dotnet/runtime/issues/88708
 CompilerDiagnostics = diagnostics.Length != 0 ? CompilerDiagnostics.None : CompilerDiagnostics.Errors,
 };
 test.ExpectedDiagnostics.AddRange(diagnostics);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Strip trivia from tokens.#88856

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 6 commits into

from

Jul 14, 2023
 Merged


Strip trivia from tokens.
#88856
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
a17cffe

Strip trivia from tokens.


jkoritzinsky Jul 13, 2023
55ff5d8

Move the trivia stripping into ContainingSyntax record constructor


jkoritzinsky Jul 13, 2023
7808204

Make ContainingSyntax a regular struct with a primary constructor ins…


jkoritzinsky Jul 13, 2023
9deb8a7

Merge branch 'trivia' of github.com:jkoritzinsky/runtime; branch 'mai…


jkoritzinsky Jul 13, 2023
d42fc74

Fix #88867


jkoritzinsky Jul 13, 2023
0a7b306

Suppress compiler diagnostics based on the linked issue.


jkoritzinsky Jul 13, 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


2 changes: 1 addition & 1 deletion
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSExportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -206,7 +206,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

 var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);

 return new IncrementalStubGenerationContext(
 signatureContext,
Expand Down

2 changes: 1 addition & 1 deletion
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSImportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -194,7 +194,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

 var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 return new IncrementalStubGenerationContext(
 signatureContext,
 containingTypeContext,
Expand Down

2 changes: 1 addition & 1 deletion
...braries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComInterfaceGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -306,7 +306,7 @@ private static IncrementalMethodStubGenerationContext CalculateStubInformation(M

 var containingSyntaxContext = new ContainingSyntaxContext(syntax);

 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers().StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);

 ImmutableArray<FunctionPointerUnmanagedCallingConventionSyntax> callConv = VirtualMethodPointerStubGenerator.GenerateCallConvSyntaxFromAttributes(
 suppressGCTransitionAttribute,
Expand Down

2 changes: 1 addition & 1 deletion
...ries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/VtableIndexStubGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -278,7 +278,7 @@ private static IncrementalMethodStubGenerationContext CalculateStubInformation(M

 var containingSyntaxContext = new ContainingSyntaxContext(syntax);

 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers().StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(syntax.Modifiers.StripAccessibilityModifiers(), SyntaxKind.MethodDeclaration, syntax.Identifier, syntax.TypeParameterList);

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

Expand Down

2 changes: 1 addition & 1 deletion
...aries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -288,7 +288,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(

 var containingTypeContext = new ContainingSyntaxContext(originalSyntax);

 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers.StripTriviaFromTokens(), SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);
 var methodSyntaxTemplate = new ContainingSyntax(originalSyntax.Modifiers, SyntaxKind.MethodDeclaration, originalSyntax.Identifier, originalSyntax.TypeParameterList);

 List<AttributeSyntax> additionalAttributes = GenerateSyntaxForForwardedAttributes(suppressGCTransitionAttribute, unmanagedCallConvAttribute, defaultDllImportSearchPathsAttribute);
 return new IncrementalStubGenerationContext(
Expand Down

20 changes: 17 additions & 3 deletions
...Runtime.InteropServices/gen/Microsoft.Interop.SourceGeneration/ContainingSyntaxContext.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,18 @@

namespace Microsoft.Interop
{
 public readonly record struct ContainingSyntax(SyntaxTokenList Modifiers, SyntaxKind TypeKind, SyntaxToken Identifier, TypeParameterListSyntax? TypeParameters)
 public readonly struct ContainingSyntax(SyntaxTokenList modifiers, SyntaxKind typeKind, SyntaxToken identifier, TypeParameterListSyntax? typeParameters) : IEquatable<ContainingSyntax>
 {
 public SyntaxTokenList Modifiers { get; init; } = modifiers.StripTriviaFromTokens();

 public SyntaxToken Identifier { get; init; } = identifier.WithoutTrivia();

 public SyntaxKind TypeKind { get; init; } = typeKind;

 public TypeParameterListSyntax? TypeParameters { get; init; } = typeParameters;

 public override bool Equals(object obj) => obj is ContainingSyntax other && Equals(other);

 public bool Equals(ContainingSyntax other)
 {
 return Modifiers.SequenceEqual(other.Modifiers, SyntaxEquivalentComparer.Instance)
Expand DownExpand Up@@ -42,8 +52,12 @@ private static ImmutableArray<ContainingSyntax> GetContainingTypes(MemberDeclara
 ImmutableArray<ContainingSyntax>.Builder containingTypeInfoBuilder = ImmutableArray.CreateBuilder<ContainingSyntax>();
 for (SyntaxNode? parent = memberDeclaration.Parent; parent is TypeDeclarationSyntax typeDeclaration; parent = parent.Parent)
 {
 containingTypeInfoBuilder.Add(new ContainingSyntax(typeDeclaration.Modifiers.StripTriviaFromTokens(), typeDeclaration.Kind(), typeDeclaration.Identifier.WithoutTrivia(),
 typeDeclaration.TypeParameterList));
 containingTypeInfoBuilder.Add(
 new ContainingSyntax(
 typeDeclaration.Modifiers,
 typeDeclaration.Kind(),
 typeDeclaration.Identifier,
 typeDeclaration.TypeParameterList));
 }

 return containingTypeInfoBuilder.ToImmutable();
Expand Down

53 changes: 14 additions & 39 deletions
...ies/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Unit.Tests/CompileFails.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -558,69 +558,45 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnValueTypes()

 // [In] is default for all non-pinned marshalled types
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute, "byte", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + "[MarshalAs(UnmanagedType.U2)]", "char", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeIsDefaultDiagnostic,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeIsDefaultDiagnostic } };

 // [Out] is not allowed on value types passed by value - there is no indirection for the callee to make visible modifications.
 var outAttributeNotSupportedOnValueParameters = new DiagnosticResult(GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails)
 .WithLocation(0)
 .WithArguments(SR.OutAttributeNotSupportedOnByValueParameters, paramName);
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters } };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(outAttribute, "IntStruct", paramNameWithLocation) + CodeSnippets.IntStructAndMarshaller,
 new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters,
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(outAttribute, "[MarshalAs(UnmanagedType.U2)] char", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };
 // [In,Out] should only warn for Out attribute
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute+outAttribute, "int", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters } };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute+outAttribute, "IntStruct", paramNameWithLocation) + CodeSnippets.IntStructAndMarshaller,
 new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters,
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + "[MarshalAs(UnmanagedType.U4)]", "bool", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute, "[MarshalAs(UnmanagedType.U2)] char", paramNameWithLocation), new DiagnosticResult[] {
 outAttributeNotSupportedOnValueParameters,
 //https://github.com/dotnet/runtime/issues/88540
 outAttributeNotSupportedOnValueParameters
 } };

Expand DownExpand Up@@ -688,12 +664,12 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnReferenceTypes()
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute, "string", paramNameWithLocation, (StringMarshalling.Utf8, null)),
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic }
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic }
 };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic }
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic }
 };

 var outNotAllowedOnRefTypes = new DiagnosticResult(GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails)
Expand All@@ -704,21 +680,21 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnReferenceTypes()
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(outAttribute, "string", paramNameWithLocation, (StringMarshalling.Utf8, null)),
 new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
 new DiagnosticResult[] { outNotAllowedOnRefTypes }
 };

 // [Out] warns on by value reference types
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(outAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
 new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
 new DiagnosticResult[] { outNotAllowedOnRefTypes }
 };

 // [In,Out] is fine on classes
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute, "IntClass", paramNameWithLocation) + CodeSnippets.IntClassAndMarshaller,
 new DiagnosticResult[] { outNotAllowedOnRefTypes, outNotAllowedOnRefTypes }
 new DiagnosticResult[] { outNotAllowedOnRefTypes }
 };

 // All refkinds are okay on classes and strings
Expand DownExpand Up@@ -774,11 +750,10 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
 .WithLocation(0)
 .WithArguments(SR.InAttributeOnlyNotSupportedOnPinnedParameters, paramName);
 yield return new object[] { ID(), codeSnippets.ByValueMarshallingOfType(inAttribute + constElementCount, "int[]", paramNameWithLocation), new DiagnosticResult[] {
 inAttributeNotSupportedOnPinnedParameter,
 //https://github.com/dotnet/runtime/issues/88540
 inAttributeNotSupportedOnPinnedParameter
 }};
 // new issue before merge: char generated code doesn't seem to work well with [In, Out]
 // blittable arrays don't support [In] only. Different diagnostics are issued because we can pin in one direction (managed->unmanaged)
 // but not the other direction.
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + constElementCount, "char[]", paramNameWithLocation, (StringMarshalling.Utf16, null)),
Expand All@@ -793,13 +768,13 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
 "bool[]",
 paramNameWithLocation,
 (StringMarshalling.Utf16, null)),
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic}
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic}
 };
 // Overriding marshalling with a custom marshaller makes it not pinned
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute, "[MarshalUsing(typeof(IntMarshaller), ElementIndirectionDepth = 1), MarshalUsing(ConstantElementCount = 10)]int[]", paramNameWithLocation) + CodeSnippets.IntMarshaller,
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic, inAttributeIsDefaultDiagnostic}
 new DiagnosticResult[] { inAttributeIsDefaultDiagnostic}
 };

 // [In, Out] is default
Expand All@@ -811,12 +786,12 @@ public static IEnumerable<object[]> ByValueMarshalAttributeOnPinnedMarshalledTyp
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + constElementCount, "int[]", paramNameWithLocation),
 new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic, inOutAttributeIsDefaultDiagnostic}
 new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic}
 };
 yield return new object[] {
 ID(),
 codeSnippets.ByValueMarshallingOfType(inAttribute + outAttribute + constElementCount, "char[]", paramNameWithLocation, (StringMarshalling.Utf16, null)),
 //https://github.com/dotnet/runtime/issues/88540
 //https://github.com/dotnet/runtime/issues/88708
 new DiagnosticResult[] { inOutAttributeIsDefaultDiagnostic }
 };

Expand DownExpand Up@@ -847,7 +822,7 @@ public async Task VerifyByValueMarshallingAttributeUsage(string id, string sourc
 {
 TestCode = source,
 TestBehaviors = TestBehaviors.SkipGeneratedSourcesCheck,
 // Our fallback mechanism for invalid code for unmanaged->managed stubs sometimes generates invalid code.
 // https://github.com/dotnet/runtime/issues/88708
 CompilerDiagnostics = diagnostics.Length != 0 ? CompilerDiagnostics.None : CompilerDiagnostics.Errors,
 };
 test.ExpectedDiagnostics.AddRange(diagnostics);
Expand Down