Skip to content

Create DiagnosticInfo as an incremental Diagnostic replacement type.#86908

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
jtschuster merged 7 commits into from
Jun 2, 2023
Merged

Create DiagnosticInfo as an incremental Diagnostic replacement type. #86908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6cbc44c
wip - build crashes on refs
jtschuster May 26, 2023
5cb008f
wip
jtschuster May 26, 2023
355fe17
wip
jtschuster May 26, 2023
cab2abf
wip
jtschuster May 26, 2023
7319660
Use Location and revert csprojs
jtschuster May 26, 2023
094a593
Re-add the old Diagnostic APIs to Microsoft.Interop.SourceGeneration
jtschuster May 30, 2023
68dac3b
Don't qualify Location
jtschuster May 31, 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
8 changes: 4 additions & 4 deletions src/libraries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/Comparers.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,11 @@ internal static class Comparers
/// <summary>
/// Comparer for an individual generated stub source as a syntax tree and the generated diagnostics for the stub.
/// </summary>
public static readonly IEqualityComparer<(MemberDeclarationSyntax Syntax, ImmutableArray<Diagnostic> Diagnostics)> GeneratedSyntax = new CustomValueTupleElementComparer<MemberDeclarationSyntax, ImmutableArray<Diagnostic>>(SyntaxEquivalentComparer.Instance, new ImmutableArraySequenceEqualComparer<Diagnostic>(EqualityComparer<Diagnostic>.Default));
public static readonly IEqualityComparer<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>)> GeneratedSyntax4 =
new CustomValueTupleElementComparer<MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>>(
public static readonly IEqualityComparer<(MemberDeclarationSyntax Syntax, ImmutableArray<DiagnosticInfo> Diagnostics)> GeneratedSyntax = new CustomValueTupleElementComparer<MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>>(SyntaxEquivalentComparer.Instance, new ImmutableArraySequenceEqualComparer<DiagnosticInfo>(EqualityComparer<DiagnosticInfo>.Default));
public static readonly IEqualityComparer<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>)> GeneratedSyntax4 =
new CustomValueTupleElementComparer<MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>>(
SyntaxEquivalentComparer.Instance, SyntaxEquivalentComparer.Instance, SyntaxEquivalentComparer.Instance,
new ImmutableArraySequenceEqualComparer<Diagnostic>(EqualityComparer<Diagnostic>.Default));
new ImmutableArraySequenceEqualComparer<DiagnosticInfo>(EqualityComparer<DiagnosticInfo>.Default));
}

/// <summary>
Expand Down
22 changes: 11 additions & 11 deletions ...s/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/GeneratorDiagnostics.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,17 +28,17 @@ public class Ids
}

private const string Category = "JSImportGenerator";
private readonly List<Diagnostic> _diagnostics = new List<Diagnostic>();
private readonly List<DiagnosticInfo> _diagnostics = new List<DiagnosticInfo>();

public IEnumerable<Diagnostic> Diagnostics => _diagnostics;
public IEnumerable<DiagnosticInfo> Diagnostics => _diagnostics;

public void ReportInvalidMarshallingAttributeInfo(
AttributeData attributeData,
string reasonResourceName,
params string[] reasonArgs)
{
_diagnostics.Add(
attributeData.CreateDiagnostic(
attributeData.CreateDiagnosticInfo(
GeneratorDiagnostics.MarshallingAttributeConfigurationNotSupported,
new LocalizableResourceString(reasonResourceName, SR.ResourceManager, typeof(FxResources.Microsoft.Interop.JavaScript.JSImportGenerator.SR), reasonArgs)));
}
Expand All@@ -57,14 +57,14 @@ public void ReportConfigurationNotSupported(
if (unsupportedValue == null)
{
_diagnostics.Add(
attributeData.CreateDiagnostic(
attributeData.CreateDiagnosticInfo(
GeneratorDiagnostics.ConfigurationNotSupported,
configurationName));
}
else
{
_diagnostics.Add(
attributeData.CreateDiagnostic(
attributeData.CreateDiagnosticInfo(
GeneratorDiagnostics.ConfigurationValueNotSupported,
unsupportedValue,
configurationName));
Expand DownExpand Up@@ -104,7 +104,7 @@ public void ReportMarshallingNotSupported(
if (info.IsManagedReturnPosition)
{
_diagnostics.Add(
diagnosticLocation.CreateDiagnostic(
diagnosticLocation.CreateDiagnosticInfo(
GeneratorDiagnostics.ReturnTypeNotSupportedWithDetails,
diagnosticProperties,
notSupportedDetails!,
Expand All@@ -113,7 +113,7 @@ public void ReportMarshallingNotSupported(
else
{
_diagnostics.Add(
diagnosticLocation.CreateDiagnostic(
diagnosticLocation.CreateDiagnosticInfo(
GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails,
diagnosticProperties,
notSupportedDetails!,
Expand All@@ -128,7 +128,7 @@ public void ReportMarshallingNotSupported(
if (info.IsManagedReturnPosition)
{
_diagnostics.Add(
diagnosticLocation.CreateDiagnostic(
diagnosticLocation.CreateDiagnosticInfo(
GeneratorDiagnostics.ReturnConfigurationNotSupported,
diagnosticProperties,
nameof(System.Runtime.InteropServices.MarshalAsAttribute),
Expand All@@ -137,7 +137,7 @@ public void ReportMarshallingNotSupported(
else
{
_diagnostics.Add(
diagnosticLocation.CreateDiagnostic(
diagnosticLocation.CreateDiagnosticInfo(
GeneratorDiagnostics.ParameterConfigurationNotSupported,
diagnosticProperties,
nameof(System.Runtime.InteropServices.MarshalAsAttribute),
Expand All@@ -150,7 +150,7 @@ public void ReportMarshallingNotSupported(
if (info.IsManagedReturnPosition)
{
_diagnostics.Add(
diagnosticLocation.CreateDiagnostic(
diagnosticLocation.CreateDiagnosticInfo(
GeneratorDiagnostics.ReturnTypeNotSupported,
diagnosticProperties,
info.ManagedType.DiagnosticFormattedName,
Expand All@@ -159,7 +159,7 @@ public void ReportMarshallingNotSupported(
else
{
_diagnostics.Add(
diagnosticLocation.CreateDiagnostic(
diagnosticLocation.CreateDiagnosticInfo(
GeneratorDiagnostics.ParameterTypeNotSupported,
diagnosticProperties,
info.ManagedType.DiagnosticFormattedName,
Expand Down
12 changes: 6 additions & 6 deletions ...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSExportGenerator.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ internal sealed record IncrementalStubGenerationContext(
MethodSignatureDiagnosticLocations DiagnosticLocation,
JSExportData JSExportData,
MarshallingGeneratorFactoryKey<(TargetFramework TargetFramework, Version TargetFrameworkVersion, JSGeneratorOptions)> GeneratorFactoryKey,
SequenceEqualImmutableArray<Diagnostic> Diagnostics);
SequenceEqualImmutableArray<DiagnosticInfo> Diagnostics);

public static class StepNames
{
Expand DownExpand Up@@ -69,13 +69,13 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
if (data.Right.IsEmpty // no attributed methods
|| data.Left.Compilation.Options is CSharpCompilationOptions { AllowUnsafe: true }) // Unsafe code enabled
{
return ImmutableArray<Diagnostic>.Empty;
return ImmutableArray<DiagnosticInfo>.Empty;
}

return ImmutableArray.Create(Diagnostic.Create(GeneratorDiagnostics.JSExportRequiresAllowUnsafeBlocks, null));
return ImmutableArray.Create(DiagnosticInfo.Create(GeneratorDiagnostics.JSExportRequiresAllowUnsafeBlocks, null));
}));

IncrementalValuesProvider<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>)> generateSingleStub = methodsToGenerate
IncrementalValuesProvider<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>)> generateSingleStub = methodsToGenerate
.Combine(stubEnvironment)
.Combine(stubOptions)
.Select(static (data, ct) => new
Expand DownExpand Up@@ -214,7 +214,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
new MethodSignatureDiagnosticLocations(originalSyntax),
jsExportData,
CreateGeneratorFactory(environment, options),
new SequenceEqualImmutableArray<Diagnostic>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
new SequenceEqualImmutableArray<DiagnosticInfo>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
}

private static MarshallingGeneratorFactoryKey<(TargetFramework, Version, JSGeneratorOptions)> CreateGeneratorFactory(StubEnvironment env, JSGeneratorOptions options)
Expand DownExpand Up@@ -286,7 +286,7 @@ private static NamespaceDeclarationSyntax GenerateRegSource(
return ns;
}

private static (MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>) GenerateSource(
private static (MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>) GenerateSource(
IncrementalStubGenerationContext incrementalContext)
{
var diagnostics = new GeneratorDiagnostics();
Expand Down
12 changes: 6 additions & 6 deletions ...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSImportGenerator.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ internal sealed record IncrementalStubGenerationContext(
MethodSignatureDiagnosticLocations DiagnosticLocation,
JSImportData JSImportData,
MarshallingGeneratorFactoryKey<(TargetFramework TargetFramework, Version TargetFrameworkVersion, JSGeneratorOptions)> GeneratorFactoryKey,
SequenceEqualImmutableArray<Diagnostic> Diagnostics);
SequenceEqualImmutableArray<DiagnosticInfo> Diagnostics);

public static class StepNames
{
Expand DownExpand Up@@ -69,13 +69,13 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
if (data.Right.IsEmpty // no attributed methods
|| data.Left.Compilation.Options is CSharpCompilationOptions { AllowUnsafe: true }) // Unsafe code enabled
{
return ImmutableArray<Diagnostic>.Empty;
return ImmutableArray<DiagnosticInfo>.Empty;
}

return ImmutableArray.Create(Diagnostic.Create(GeneratorDiagnostics.JSImportRequiresAllowUnsafeBlocks, null));
return ImmutableArray.Create(DiagnosticInfo.Create(GeneratorDiagnostics.JSImportRequiresAllowUnsafeBlocks, null));
}));

IncrementalValuesProvider<(MemberDeclarationSyntax, ImmutableArray<Diagnostic>)> generateSingleStub = methodsToGenerate
IncrementalValuesProvider<(MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>)> generateSingleStub = methodsToGenerate
.Combine(stubEnvironment)
.Combine(stubOptions)
.Select(static (data, ct) => new
Expand DownExpand Up@@ -201,7 +201,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
new MethodSignatureDiagnosticLocations(originalSyntax),
jsImportData,
CreateGeneratorFactory(environment, options),
new SequenceEqualImmutableArray<Diagnostic>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
new SequenceEqualImmutableArray<DiagnosticInfo>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
}

private static MarshallingGeneratorFactoryKey<(TargetFramework, Version, JSGeneratorOptions)> CreateGeneratorFactory(StubEnvironment env, JSGeneratorOptions options)
Expand All@@ -211,7 +211,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
return MarshallingGeneratorFactoryKey.Create((env.TargetFramework, env.TargetFrameworkVersion, options), jsGeneratorFactory);
}

private static (MemberDeclarationSyntax, ImmutableArray<Diagnostic>) GenerateSource(
private static (MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>) GenerateSource(
IncrementalStubGenerationContext incrementalContext)
{
var diagnostics = new GeneratorDiagnostics();
Expand Down
2 changes: 1 addition & 1 deletion ...ropServices/gen/ComInterfaceGenerator/Analyzers/GeneratedComInterfaceAttributeAnalyzer.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ public override void Initialize(AnalysisContext context)
&& GetAttribute(typeSymbol, TypeNames.InterfaceTypeAttribute, out AttributeData? comInterfaceAttribute)
&& !InterfaceTypeAttributeIsSupported(comInterfaceAttribute, out string unsupportedValue))
{
context.ReportDiagnostic(comInterfaceAttribute.CreateDiagnostic(AnalyzerDiagnostics.InterfaceTypeNotSupported, unsupportedValue));
context.ReportDiagnostic(comInterfaceAttribute.CreateDiagnosticInfo(AnalyzerDiagnostics.InterfaceTypeNotSupported, unsupportedValue).ToDiagnostic());
}
}, SymbolKind.NamedType);
}
Expand Down
4 changes: 2 additions & 2 deletions ...libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComInterfaceContext.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,9 +57,9 @@ DiagnosticOr<ComInterfaceContext> AddContext(ComInterfaceInfo iface)
{
// The base has failed generation at some point, so this interface cannot be generated
var diagnostic = DiagnosticOr<ComInterfaceContext>.From(
Diagnostic.Create(
DiagnosticInfo.Create(
GeneratorDiagnostics.BaseInterfaceIsNotGenerated,
iface.DiagnosticLocation.AsLocation(), iface.ThisInterfaceKey, iface.BaseInterfaceKey));
iface.DiagnosticLocation, iface.ThisInterfaceKey, iface.BaseInterfaceKey));
nameToContextCache[iface.ThisInterfaceKey] = diagnostic;
return diagnostic;
}
Expand Down
Loading
, '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" + '
Create DiagnosticInfo as an incremental Diagnostic replacement type. by jtschuster · Pull Request #86908 · dotnet/runtime · GitHub
Skip to content
Create DiagnosticInfo as an incremental Diagnostic replacement type.#86908

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

jtschuster
merged 7 commits into

from

Jun 2, 2023
 Merged


Create DiagnosticInfo as an incremental Diagnostic replacement type.
#86908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
6cbc44c

wip - build crashes on refs


jtschuster May 26, 2023
5cb008f

wip


jtschuster May 26, 2023
355fe17

wip


jtschuster May 26, 2023
cab2abf

wip


jtschuster May 26, 2023
7319660

Use Location and revert csprojs


jtschuster May 26, 2023
094a593

Re-add the old Diagnostic APIs to Microsoft.Interop.SourceGeneration


jtschuster May 30, 2023
68dac3b

Don't qualify Location


jtschuster May 31, 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


8 changes: 4 additions & 4 deletions
src/libraries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/Comparers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,11 @@ internal static class Comparers
 /// <summary>
 /// Comparer for an individual generated stub source as a syntax tree and the generated diagnostics for the stub.
 /// </summary>
 public static readonly IEqualityComparer<(MemberDeclarationSyntax Syntax, ImmutableArray<Diagnostic> Diagnostics)> GeneratedSyntax = new CustomValueTupleElementComparer<MemberDeclarationSyntax, ImmutableArray<Diagnostic>>(SyntaxEquivalentComparer.Instance, new ImmutableArraySequenceEqualComparer<Diagnostic>(EqualityComparer<Diagnostic>.Default));
 public static readonly IEqualityComparer<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>)> GeneratedSyntax4 =
 new CustomValueTupleElementComparer<MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>>(
 public static readonly IEqualityComparer<(MemberDeclarationSyntax Syntax, ImmutableArray<DiagnosticInfo> Diagnostics)> GeneratedSyntax = new CustomValueTupleElementComparer<MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>>(SyntaxEquivalentComparer.Instance, new ImmutableArraySequenceEqualComparer<DiagnosticInfo>(EqualityComparer<DiagnosticInfo>.Default));
 public static readonly IEqualityComparer<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>)> GeneratedSyntax4 =
 new CustomValueTupleElementComparer<MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>>(
 SyntaxEquivalentComparer.Instance, SyntaxEquivalentComparer.Instance, SyntaxEquivalentComparer.Instance,
 new ImmutableArraySequenceEqualComparer<Diagnostic>(EqualityComparer<Diagnostic>.Default));
 new ImmutableArraySequenceEqualComparer<DiagnosticInfo>(EqualityComparer<DiagnosticInfo>.Default));
 }

 /// <summary>
Expand Down

22 changes: 11 additions & 11 deletions
...s/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/GeneratorDiagnostics.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,17 +28,17 @@ public class Ids
 }

 private const string Category = "JSImportGenerator";
 private readonly List<Diagnostic> _diagnostics = new List<Diagnostic>();
 private readonly List<DiagnosticInfo> _diagnostics = new List<DiagnosticInfo>();

 public IEnumerable<Diagnostic> Diagnostics => _diagnostics;
 public IEnumerable<DiagnosticInfo> Diagnostics => _diagnostics;

 public void ReportInvalidMarshallingAttributeInfo(
 AttributeData attributeData,
 string reasonResourceName,
 params string[] reasonArgs)
 {
 _diagnostics.Add(
 attributeData.CreateDiagnostic(
 attributeData.CreateDiagnosticInfo(
 GeneratorDiagnostics.MarshallingAttributeConfigurationNotSupported,
 new LocalizableResourceString(reasonResourceName, SR.ResourceManager, typeof(FxResources.Microsoft.Interop.JavaScript.JSImportGenerator.SR), reasonArgs)));
 }
Expand All@@ -57,14 +57,14 @@ public void ReportConfigurationNotSupported(
 if (unsupportedValue == null)
 {
 _diagnostics.Add(
 attributeData.CreateDiagnostic(
 attributeData.CreateDiagnosticInfo(
 GeneratorDiagnostics.ConfigurationNotSupported,
 configurationName));
 }
 else
 {
 _diagnostics.Add(
 attributeData.CreateDiagnostic(
 attributeData.CreateDiagnosticInfo(
 GeneratorDiagnostics.ConfigurationValueNotSupported,
 unsupportedValue,
 configurationName));
Expand DownExpand Up@@ -104,7 +104,7 @@ public void ReportMarshallingNotSupported(
 if (info.IsManagedReturnPosition)
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ReturnTypeNotSupportedWithDetails,
 diagnosticProperties,
 notSupportedDetails!,
Expand All@@ -113,7 +113,7 @@ public void ReportMarshallingNotSupported(
 else
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails,
 diagnosticProperties,
 notSupportedDetails!,
Expand All@@ -128,7 +128,7 @@ public void ReportMarshallingNotSupported(
 if (info.IsManagedReturnPosition)
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ReturnConfigurationNotSupported,
 diagnosticProperties,
 nameof(System.Runtime.InteropServices.MarshalAsAttribute),
Expand All@@ -137,7 +137,7 @@ public void ReportMarshallingNotSupported(
 else
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ParameterConfigurationNotSupported,
 diagnosticProperties,
 nameof(System.Runtime.InteropServices.MarshalAsAttribute),
Expand All@@ -150,7 +150,7 @@ public void ReportMarshallingNotSupported(
 if (info.IsManagedReturnPosition)
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ReturnTypeNotSupported,
 diagnosticProperties,
 info.ManagedType.DiagnosticFormattedName,
Expand All@@ -159,7 +159,7 @@ public void ReportMarshallingNotSupported(
 else
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ParameterTypeNotSupported,
 diagnosticProperties,
 info.ManagedType.DiagnosticFormattedName,
Expand Down

12 changes: 6 additions & 6 deletions
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSExportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ internal sealed record IncrementalStubGenerationContext(
 MethodSignatureDiagnosticLocations DiagnosticLocation,
 JSExportData JSExportData,
 MarshallingGeneratorFactoryKey<(TargetFramework TargetFramework, Version TargetFrameworkVersion, JSGeneratorOptions)> GeneratorFactoryKey,
 SequenceEqualImmutableArray<Diagnostic> Diagnostics);
 SequenceEqualImmutableArray<DiagnosticInfo> Diagnostics);

 public static class StepNames
 {
Expand DownExpand Up@@ -69,13 +69,13 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 if (data.Right.IsEmpty // no attributed methods
 || data.Left.Compilation.Options is CSharpCompilationOptions { AllowUnsafe: true }) // Unsafe code enabled
 {
 return ImmutableArray<Diagnostic>.Empty;
 return ImmutableArray<DiagnosticInfo>.Empty;
 }

 return ImmutableArray.Create(Diagnostic.Create(GeneratorDiagnostics.JSExportRequiresAllowUnsafeBlocks, null));
 return ImmutableArray.Create(DiagnosticInfo.Create(GeneratorDiagnostics.JSExportRequiresAllowUnsafeBlocks, null));
 }));

 IncrementalValuesProvider<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>)> generateSingleStub = methodsToGenerate
 IncrementalValuesProvider<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>)> generateSingleStub = methodsToGenerate
 .Combine(stubEnvironment)
 .Combine(stubOptions)
 .Select(static (data, ct) => new
Expand DownExpand Up@@ -214,7 +214,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
 new MethodSignatureDiagnosticLocations(originalSyntax),
 jsExportData,
 CreateGeneratorFactory(environment, options),
 new SequenceEqualImmutableArray<Diagnostic>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 new SequenceEqualImmutableArray<DiagnosticInfo>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 }

 private static MarshallingGeneratorFactoryKey<(TargetFramework, Version, JSGeneratorOptions)> CreateGeneratorFactory(StubEnvironment env, JSGeneratorOptions options)
Expand DownExpand Up@@ -286,7 +286,7 @@ private static NamespaceDeclarationSyntax GenerateRegSource(
 return ns;
 }

 private static (MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>) GenerateSource(
 private static (MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>) GenerateSource(
 IncrementalStubGenerationContext incrementalContext)
 {
 var diagnostics = new GeneratorDiagnostics();
Expand Down

12 changes: 6 additions & 6 deletions
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSImportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ internal sealed record IncrementalStubGenerationContext(
 MethodSignatureDiagnosticLocations DiagnosticLocation,
 JSImportData JSImportData,
 MarshallingGeneratorFactoryKey<(TargetFramework TargetFramework, Version TargetFrameworkVersion, JSGeneratorOptions)> GeneratorFactoryKey,
 SequenceEqualImmutableArray<Diagnostic> Diagnostics);
 SequenceEqualImmutableArray<DiagnosticInfo> Diagnostics);

 public static class StepNames
 {
Expand DownExpand Up@@ -69,13 +69,13 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 if (data.Right.IsEmpty // no attributed methods
 || data.Left.Compilation.Options is CSharpCompilationOptions { AllowUnsafe: true }) // Unsafe code enabled
 {
 return ImmutableArray<Diagnostic>.Empty;
 return ImmutableArray<DiagnosticInfo>.Empty;
 }

 return ImmutableArray.Create(Diagnostic.Create(GeneratorDiagnostics.JSImportRequiresAllowUnsafeBlocks, null));
 return ImmutableArray.Create(DiagnosticInfo.Create(GeneratorDiagnostics.JSImportRequiresAllowUnsafeBlocks, null));
 }));

 IncrementalValuesProvider<(MemberDeclarationSyntax, ImmutableArray<Diagnostic>)> generateSingleStub = methodsToGenerate
 IncrementalValuesProvider<(MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>)> generateSingleStub = methodsToGenerate
 .Combine(stubEnvironment)
 .Combine(stubOptions)
 .Select(static (data, ct) => new
Expand DownExpand Up@@ -201,7 +201,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
 new MethodSignatureDiagnosticLocations(originalSyntax),
 jsImportData,
 CreateGeneratorFactory(environment, options),
 new SequenceEqualImmutableArray<Diagnostic>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 new SequenceEqualImmutableArray<DiagnosticInfo>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 }

 private static MarshallingGeneratorFactoryKey<(TargetFramework, Version, JSGeneratorOptions)> CreateGeneratorFactory(StubEnvironment env, JSGeneratorOptions options)
Expand All@@ -211,7 +211,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
 return MarshallingGeneratorFactoryKey.Create((env.TargetFramework, env.TargetFrameworkVersion, options), jsGeneratorFactory);
 }

 private static (MemberDeclarationSyntax, ImmutableArray<Diagnostic>) GenerateSource(
 private static (MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>) GenerateSource(
 IncrementalStubGenerationContext incrementalContext)
 {
 var diagnostics = new GeneratorDiagnostics();
Expand Down

2 changes: 1 addition & 1 deletion
...ropServices/gen/ComInterfaceGenerator/Analyzers/GeneratedComInterfaceAttributeAnalyzer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ public override void Initialize(AnalysisContext context)
 && GetAttribute(typeSymbol, TypeNames.InterfaceTypeAttribute, out AttributeData? comInterfaceAttribute)
 && !InterfaceTypeAttributeIsSupported(comInterfaceAttribute, out string unsupportedValue))
 {
 context.ReportDiagnostic(comInterfaceAttribute.CreateDiagnostic(AnalyzerDiagnostics.InterfaceTypeNotSupported, unsupportedValue));
 context.ReportDiagnostic(comInterfaceAttribute.CreateDiagnosticInfo(AnalyzerDiagnostics.InterfaceTypeNotSupported, unsupportedValue).ToDiagnostic());
 }
 }, SymbolKind.NamedType);
 }
Expand Down

4 changes: 2 additions & 2 deletions
...libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComInterfaceContext.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,9 +57,9 @@ DiagnosticOr<ComInterfaceContext> AddContext(ComInterfaceInfo iface)
 {
 // The base has failed generation at some point, so this interface cannot be generated
 var diagnostic = DiagnosticOr<ComInterfaceContext>.From(
Diagnostic.Create(
DiagnosticInfo.Create(
 GeneratorDiagnostics.BaseInterfaceIsNotGenerated,
 iface.DiagnosticLocation.AsLocation(), iface.ThisInterfaceKey, iface.BaseInterfaceKey));
 iface.DiagnosticLocation, iface.ThisInterfaceKey, iface.BaseInterfaceKey));
 nameToContextCache[iface.ThisInterfaceKey] = diagnostic;
 return diagnostic;
 }
Expand Down
Loading

, '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('^' + ".*" + '
Create DiagnosticInfo as an incremental Diagnostic replacement type. by jtschuster · Pull Request #86908 · dotnet/runtime · GitHub
Skip to content
Create DiagnosticInfo as an incremental Diagnostic replacement type.#86908

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

jtschuster
merged 7 commits into

from

Jun 2, 2023
 Merged


Create DiagnosticInfo as an incremental Diagnostic replacement type.
#86908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
6cbc44c

wip - build crashes on refs


jtschuster May 26, 2023
5cb008f

wip


jtschuster May 26, 2023
355fe17

wip


jtschuster May 26, 2023
cab2abf

wip


jtschuster May 26, 2023
7319660

Use Location and revert csprojs


jtschuster May 26, 2023
094a593

Re-add the old Diagnostic APIs to Microsoft.Interop.SourceGeneration


jtschuster May 30, 2023
68dac3b

Don't qualify Location


jtschuster May 31, 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


8 changes: 4 additions & 4 deletions
src/libraries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/Comparers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,11 @@ internal static class Comparers
 /// <summary>
 /// Comparer for an individual generated stub source as a syntax tree and the generated diagnostics for the stub.
 /// </summary>
 public static readonly IEqualityComparer<(MemberDeclarationSyntax Syntax, ImmutableArray<Diagnostic> Diagnostics)> GeneratedSyntax = new CustomValueTupleElementComparer<MemberDeclarationSyntax, ImmutableArray<Diagnostic>>(SyntaxEquivalentComparer.Instance, new ImmutableArraySequenceEqualComparer<Diagnostic>(EqualityComparer<Diagnostic>.Default));
 public static readonly IEqualityComparer<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>)> GeneratedSyntax4 =
 new CustomValueTupleElementComparer<MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>>(
 public static readonly IEqualityComparer<(MemberDeclarationSyntax Syntax, ImmutableArray<DiagnosticInfo> Diagnostics)> GeneratedSyntax = new CustomValueTupleElementComparer<MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>>(SyntaxEquivalentComparer.Instance, new ImmutableArraySequenceEqualComparer<DiagnosticInfo>(EqualityComparer<DiagnosticInfo>.Default));
 public static readonly IEqualityComparer<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>)> GeneratedSyntax4 =
 new CustomValueTupleElementComparer<MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>>(
 SyntaxEquivalentComparer.Instance, SyntaxEquivalentComparer.Instance, SyntaxEquivalentComparer.Instance,
 new ImmutableArraySequenceEqualComparer<Diagnostic>(EqualityComparer<Diagnostic>.Default));
 new ImmutableArraySequenceEqualComparer<DiagnosticInfo>(EqualityComparer<DiagnosticInfo>.Default));
 }

 /// <summary>
Expand Down

22 changes: 11 additions & 11 deletions
...s/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/GeneratorDiagnostics.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,17 +28,17 @@ public class Ids
 }

 private const string Category = "JSImportGenerator";
 private readonly List<Diagnostic> _diagnostics = new List<Diagnostic>();
 private readonly List<DiagnosticInfo> _diagnostics = new List<DiagnosticInfo>();

 public IEnumerable<Diagnostic> Diagnostics => _diagnostics;
 public IEnumerable<DiagnosticInfo> Diagnostics => _diagnostics;

 public void ReportInvalidMarshallingAttributeInfo(
 AttributeData attributeData,
 string reasonResourceName,
 params string[] reasonArgs)
 {
 _diagnostics.Add(
 attributeData.CreateDiagnostic(
 attributeData.CreateDiagnosticInfo(
 GeneratorDiagnostics.MarshallingAttributeConfigurationNotSupported,
 new LocalizableResourceString(reasonResourceName, SR.ResourceManager, typeof(FxResources.Microsoft.Interop.JavaScript.JSImportGenerator.SR), reasonArgs)));
 }
Expand All@@ -57,14 +57,14 @@ public void ReportConfigurationNotSupported(
 if (unsupportedValue == null)
 {
 _diagnostics.Add(
 attributeData.CreateDiagnostic(
 attributeData.CreateDiagnosticInfo(
 GeneratorDiagnostics.ConfigurationNotSupported,
 configurationName));
 }
 else
 {
 _diagnostics.Add(
 attributeData.CreateDiagnostic(
 attributeData.CreateDiagnosticInfo(
 GeneratorDiagnostics.ConfigurationValueNotSupported,
 unsupportedValue,
 configurationName));
Expand DownExpand Up@@ -104,7 +104,7 @@ public void ReportMarshallingNotSupported(
 if (info.IsManagedReturnPosition)
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ReturnTypeNotSupportedWithDetails,
 diagnosticProperties,
 notSupportedDetails!,
Expand All@@ -113,7 +113,7 @@ public void ReportMarshallingNotSupported(
 else
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails,
 diagnosticProperties,
 notSupportedDetails!,
Expand All@@ -128,7 +128,7 @@ public void ReportMarshallingNotSupported(
 if (info.IsManagedReturnPosition)
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ReturnConfigurationNotSupported,
 diagnosticProperties,
 nameof(System.Runtime.InteropServices.MarshalAsAttribute),
Expand All@@ -137,7 +137,7 @@ public void ReportMarshallingNotSupported(
 else
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ParameterConfigurationNotSupported,
 diagnosticProperties,
 nameof(System.Runtime.InteropServices.MarshalAsAttribute),
Expand All@@ -150,7 +150,7 @@ public void ReportMarshallingNotSupported(
 if (info.IsManagedReturnPosition)
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ReturnTypeNotSupported,
 diagnosticProperties,
 info.ManagedType.DiagnosticFormattedName,
Expand All@@ -159,7 +159,7 @@ public void ReportMarshallingNotSupported(
 else
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ParameterTypeNotSupported,
 diagnosticProperties,
 info.ManagedType.DiagnosticFormattedName,
Expand Down

12 changes: 6 additions & 6 deletions
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSExportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ internal sealed record IncrementalStubGenerationContext(
 MethodSignatureDiagnosticLocations DiagnosticLocation,
 JSExportData JSExportData,
 MarshallingGeneratorFactoryKey<(TargetFramework TargetFramework, Version TargetFrameworkVersion, JSGeneratorOptions)> GeneratorFactoryKey,
 SequenceEqualImmutableArray<Diagnostic> Diagnostics);
 SequenceEqualImmutableArray<DiagnosticInfo> Diagnostics);

 public static class StepNames
 {
Expand DownExpand Up@@ -69,13 +69,13 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 if (data.Right.IsEmpty // no attributed methods
 || data.Left.Compilation.Options is CSharpCompilationOptions { AllowUnsafe: true }) // Unsafe code enabled
 {
 return ImmutableArray<Diagnostic>.Empty;
 return ImmutableArray<DiagnosticInfo>.Empty;
 }

 return ImmutableArray.Create(Diagnostic.Create(GeneratorDiagnostics.JSExportRequiresAllowUnsafeBlocks, null));
 return ImmutableArray.Create(DiagnosticInfo.Create(GeneratorDiagnostics.JSExportRequiresAllowUnsafeBlocks, null));
 }));

 IncrementalValuesProvider<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>)> generateSingleStub = methodsToGenerate
 IncrementalValuesProvider<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>)> generateSingleStub = methodsToGenerate
 .Combine(stubEnvironment)
 .Combine(stubOptions)
 .Select(static (data, ct) => new
Expand DownExpand Up@@ -214,7 +214,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
 new MethodSignatureDiagnosticLocations(originalSyntax),
 jsExportData,
 CreateGeneratorFactory(environment, options),
 new SequenceEqualImmutableArray<Diagnostic>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 new SequenceEqualImmutableArray<DiagnosticInfo>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 }

 private static MarshallingGeneratorFactoryKey<(TargetFramework, Version, JSGeneratorOptions)> CreateGeneratorFactory(StubEnvironment env, JSGeneratorOptions options)
Expand DownExpand Up@@ -286,7 +286,7 @@ private static NamespaceDeclarationSyntax GenerateRegSource(
 return ns;
 }

 private static (MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>) GenerateSource(
 private static (MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>) GenerateSource(
 IncrementalStubGenerationContext incrementalContext)
 {
 var diagnostics = new GeneratorDiagnostics();
Expand Down

12 changes: 6 additions & 6 deletions
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSImportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ internal sealed record IncrementalStubGenerationContext(
 MethodSignatureDiagnosticLocations DiagnosticLocation,
 JSImportData JSImportData,
 MarshallingGeneratorFactoryKey<(TargetFramework TargetFramework, Version TargetFrameworkVersion, JSGeneratorOptions)> GeneratorFactoryKey,
 SequenceEqualImmutableArray<Diagnostic> Diagnostics);
 SequenceEqualImmutableArray<DiagnosticInfo> Diagnostics);

 public static class StepNames
 {
Expand DownExpand Up@@ -69,13 +69,13 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 if (data.Right.IsEmpty // no attributed methods
 || data.Left.Compilation.Options is CSharpCompilationOptions { AllowUnsafe: true }) // Unsafe code enabled
 {
 return ImmutableArray<Diagnostic>.Empty;
 return ImmutableArray<DiagnosticInfo>.Empty;
 }

 return ImmutableArray.Create(Diagnostic.Create(GeneratorDiagnostics.JSImportRequiresAllowUnsafeBlocks, null));
 return ImmutableArray.Create(DiagnosticInfo.Create(GeneratorDiagnostics.JSImportRequiresAllowUnsafeBlocks, null));
 }));

 IncrementalValuesProvider<(MemberDeclarationSyntax, ImmutableArray<Diagnostic>)> generateSingleStub = methodsToGenerate
 IncrementalValuesProvider<(MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>)> generateSingleStub = methodsToGenerate
 .Combine(stubEnvironment)
 .Combine(stubOptions)
 .Select(static (data, ct) => new
Expand DownExpand Up@@ -201,7 +201,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
 new MethodSignatureDiagnosticLocations(originalSyntax),
 jsImportData,
 CreateGeneratorFactory(environment, options),
 new SequenceEqualImmutableArray<Diagnostic>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 new SequenceEqualImmutableArray<DiagnosticInfo>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 }

 private static MarshallingGeneratorFactoryKey<(TargetFramework, Version, JSGeneratorOptions)> CreateGeneratorFactory(StubEnvironment env, JSGeneratorOptions options)
Expand All@@ -211,7 +211,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
 return MarshallingGeneratorFactoryKey.Create((env.TargetFramework, env.TargetFrameworkVersion, options), jsGeneratorFactory);
 }

 private static (MemberDeclarationSyntax, ImmutableArray<Diagnostic>) GenerateSource(
 private static (MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>) GenerateSource(
 IncrementalStubGenerationContext incrementalContext)
 {
 var diagnostics = new GeneratorDiagnostics();
Expand Down

2 changes: 1 addition & 1 deletion
...ropServices/gen/ComInterfaceGenerator/Analyzers/GeneratedComInterfaceAttributeAnalyzer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ public override void Initialize(AnalysisContext context)
 && GetAttribute(typeSymbol, TypeNames.InterfaceTypeAttribute, out AttributeData? comInterfaceAttribute)
 && !InterfaceTypeAttributeIsSupported(comInterfaceAttribute, out string unsupportedValue))
 {
 context.ReportDiagnostic(comInterfaceAttribute.CreateDiagnostic(AnalyzerDiagnostics.InterfaceTypeNotSupported, unsupportedValue));
 context.ReportDiagnostic(comInterfaceAttribute.CreateDiagnosticInfo(AnalyzerDiagnostics.InterfaceTypeNotSupported, unsupportedValue).ToDiagnostic());
 }
 }, SymbolKind.NamedType);
 }
Expand Down

4 changes: 2 additions & 2 deletions
...libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComInterfaceContext.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,9 +57,9 @@ DiagnosticOr<ComInterfaceContext> AddContext(ComInterfaceInfo iface)
 {
 // The base has failed generation at some point, so this interface cannot be generated
 var diagnostic = DiagnosticOr<ComInterfaceContext>.From(
Diagnostic.Create(
DiagnosticInfo.Create(
 GeneratorDiagnostics.BaseInterfaceIsNotGenerated,
 iface.DiagnosticLocation.AsLocation(), iface.ThisInterfaceKey, iface.BaseInterfaceKey));
 iface.DiagnosticLocation, iface.ThisInterfaceKey, iface.BaseInterfaceKey));
 nameToContextCache[iface.ThisInterfaceKey] = diagnostic;
 return diagnostic;
 }
Expand Down
Loading

, '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('^' + ".*" + '
Create DiagnosticInfo as an incremental Diagnostic replacement type. by jtschuster · Pull Request #86908 · dotnet/runtime · GitHub
Skip to content
Create DiagnosticInfo as an incremental Diagnostic replacement type.#86908

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

jtschuster
merged 7 commits into

from

Jun 2, 2023
 Merged


Create DiagnosticInfo as an incremental Diagnostic replacement type.
#86908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
6cbc44c

wip - build crashes on refs


jtschuster May 26, 2023
5cb008f

wip


jtschuster May 26, 2023
355fe17

wip


jtschuster May 26, 2023
cab2abf

wip


jtschuster May 26, 2023
7319660

Use Location and revert csprojs


jtschuster May 26, 2023
094a593

Re-add the old Diagnostic APIs to Microsoft.Interop.SourceGeneration


jtschuster May 30, 2023
68dac3b

Don't qualify Location


jtschuster May 31, 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


8 changes: 4 additions & 4 deletions
src/libraries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/Comparers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,11 @@ internal static class Comparers
 /// <summary>
 /// Comparer for an individual generated stub source as a syntax tree and the generated diagnostics for the stub.
 /// </summary>
 public static readonly IEqualityComparer<(MemberDeclarationSyntax Syntax, ImmutableArray<Diagnostic> Diagnostics)> GeneratedSyntax = new CustomValueTupleElementComparer<MemberDeclarationSyntax, ImmutableArray<Diagnostic>>(SyntaxEquivalentComparer.Instance, new ImmutableArraySequenceEqualComparer<Diagnostic>(EqualityComparer<Diagnostic>.Default));
 public static readonly IEqualityComparer<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>)> GeneratedSyntax4 =
 new CustomValueTupleElementComparer<MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>>(
 public static readonly IEqualityComparer<(MemberDeclarationSyntax Syntax, ImmutableArray<DiagnosticInfo> Diagnostics)> GeneratedSyntax = new CustomValueTupleElementComparer<MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>>(SyntaxEquivalentComparer.Instance, new ImmutableArraySequenceEqualComparer<DiagnosticInfo>(EqualityComparer<DiagnosticInfo>.Default));
 public static readonly IEqualityComparer<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>)> GeneratedSyntax4 =
 new CustomValueTupleElementComparer<MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>>(
 SyntaxEquivalentComparer.Instance, SyntaxEquivalentComparer.Instance, SyntaxEquivalentComparer.Instance,
 new ImmutableArraySequenceEqualComparer<Diagnostic>(EqualityComparer<Diagnostic>.Default));
 new ImmutableArraySequenceEqualComparer<DiagnosticInfo>(EqualityComparer<DiagnosticInfo>.Default));
 }

 /// <summary>
Expand Down

22 changes: 11 additions & 11 deletions
...s/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/GeneratorDiagnostics.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,17 +28,17 @@ public class Ids
 }

 private const string Category = "JSImportGenerator";
 private readonly List<Diagnostic> _diagnostics = new List<Diagnostic>();
 private readonly List<DiagnosticInfo> _diagnostics = new List<DiagnosticInfo>();

 public IEnumerable<Diagnostic> Diagnostics => _diagnostics;
 public IEnumerable<DiagnosticInfo> Diagnostics => _diagnostics;

 public void ReportInvalidMarshallingAttributeInfo(
 AttributeData attributeData,
 string reasonResourceName,
 params string[] reasonArgs)
 {
 _diagnostics.Add(
 attributeData.CreateDiagnostic(
 attributeData.CreateDiagnosticInfo(
 GeneratorDiagnostics.MarshallingAttributeConfigurationNotSupported,
 new LocalizableResourceString(reasonResourceName, SR.ResourceManager, typeof(FxResources.Microsoft.Interop.JavaScript.JSImportGenerator.SR), reasonArgs)));
 }
Expand All@@ -57,14 +57,14 @@ public void ReportConfigurationNotSupported(
 if (unsupportedValue == null)
 {
 _diagnostics.Add(
 attributeData.CreateDiagnostic(
 attributeData.CreateDiagnosticInfo(
 GeneratorDiagnostics.ConfigurationNotSupported,
 configurationName));
 }
 else
 {
 _diagnostics.Add(
 attributeData.CreateDiagnostic(
 attributeData.CreateDiagnosticInfo(
 GeneratorDiagnostics.ConfigurationValueNotSupported,
 unsupportedValue,
 configurationName));
Expand DownExpand Up@@ -104,7 +104,7 @@ public void ReportMarshallingNotSupported(
 if (info.IsManagedReturnPosition)
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ReturnTypeNotSupportedWithDetails,
 diagnosticProperties,
 notSupportedDetails!,
Expand All@@ -113,7 +113,7 @@ public void ReportMarshallingNotSupported(
 else
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails,
 diagnosticProperties,
 notSupportedDetails!,
Expand All@@ -128,7 +128,7 @@ public void ReportMarshallingNotSupported(
 if (info.IsManagedReturnPosition)
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ReturnConfigurationNotSupported,
 diagnosticProperties,
 nameof(System.Runtime.InteropServices.MarshalAsAttribute),
Expand All@@ -137,7 +137,7 @@ public void ReportMarshallingNotSupported(
 else
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ParameterConfigurationNotSupported,
 diagnosticProperties,
 nameof(System.Runtime.InteropServices.MarshalAsAttribute),
Expand All@@ -150,7 +150,7 @@ public void ReportMarshallingNotSupported(
 if (info.IsManagedReturnPosition)
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ReturnTypeNotSupported,
 diagnosticProperties,
 info.ManagedType.DiagnosticFormattedName,
Expand All@@ -159,7 +159,7 @@ public void ReportMarshallingNotSupported(
 else
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ParameterTypeNotSupported,
 diagnosticProperties,
 info.ManagedType.DiagnosticFormattedName,
Expand Down

12 changes: 6 additions & 6 deletions
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSExportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ internal sealed record IncrementalStubGenerationContext(
 MethodSignatureDiagnosticLocations DiagnosticLocation,
 JSExportData JSExportData,
 MarshallingGeneratorFactoryKey<(TargetFramework TargetFramework, Version TargetFrameworkVersion, JSGeneratorOptions)> GeneratorFactoryKey,
 SequenceEqualImmutableArray<Diagnostic> Diagnostics);
 SequenceEqualImmutableArray<DiagnosticInfo> Diagnostics);

 public static class StepNames
 {
Expand DownExpand Up@@ -69,13 +69,13 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 if (data.Right.IsEmpty // no attributed methods
 || data.Left.Compilation.Options is CSharpCompilationOptions { AllowUnsafe: true }) // Unsafe code enabled
 {
 return ImmutableArray<Diagnostic>.Empty;
 return ImmutableArray<DiagnosticInfo>.Empty;
 }

 return ImmutableArray.Create(Diagnostic.Create(GeneratorDiagnostics.JSExportRequiresAllowUnsafeBlocks, null));
 return ImmutableArray.Create(DiagnosticInfo.Create(GeneratorDiagnostics.JSExportRequiresAllowUnsafeBlocks, null));
 }));

 IncrementalValuesProvider<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>)> generateSingleStub = methodsToGenerate
 IncrementalValuesProvider<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>)> generateSingleStub = methodsToGenerate
 .Combine(stubEnvironment)
 .Combine(stubOptions)
 .Select(static (data, ct) => new
Expand DownExpand Up@@ -214,7 +214,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
 new MethodSignatureDiagnosticLocations(originalSyntax),
 jsExportData,
 CreateGeneratorFactory(environment, options),
 new SequenceEqualImmutableArray<Diagnostic>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 new SequenceEqualImmutableArray<DiagnosticInfo>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 }

 private static MarshallingGeneratorFactoryKey<(TargetFramework, Version, JSGeneratorOptions)> CreateGeneratorFactory(StubEnvironment env, JSGeneratorOptions options)
Expand DownExpand Up@@ -286,7 +286,7 @@ private static NamespaceDeclarationSyntax GenerateRegSource(
 return ns;
 }

 private static (MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>) GenerateSource(
 private static (MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>) GenerateSource(
 IncrementalStubGenerationContext incrementalContext)
 {
 var diagnostics = new GeneratorDiagnostics();
Expand Down

12 changes: 6 additions & 6 deletions
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSImportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ internal sealed record IncrementalStubGenerationContext(
 MethodSignatureDiagnosticLocations DiagnosticLocation,
 JSImportData JSImportData,
 MarshallingGeneratorFactoryKey<(TargetFramework TargetFramework, Version TargetFrameworkVersion, JSGeneratorOptions)> GeneratorFactoryKey,
 SequenceEqualImmutableArray<Diagnostic> Diagnostics);
 SequenceEqualImmutableArray<DiagnosticInfo> Diagnostics);

 public static class StepNames
 {
Expand DownExpand Up@@ -69,13 +69,13 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 if (data.Right.IsEmpty // no attributed methods
 || data.Left.Compilation.Options is CSharpCompilationOptions { AllowUnsafe: true }) // Unsafe code enabled
 {
 return ImmutableArray<Diagnostic>.Empty;
 return ImmutableArray<DiagnosticInfo>.Empty;
 }

 return ImmutableArray.Create(Diagnostic.Create(GeneratorDiagnostics.JSImportRequiresAllowUnsafeBlocks, null));
 return ImmutableArray.Create(DiagnosticInfo.Create(GeneratorDiagnostics.JSImportRequiresAllowUnsafeBlocks, null));
 }));

 IncrementalValuesProvider<(MemberDeclarationSyntax, ImmutableArray<Diagnostic>)> generateSingleStub = methodsToGenerate
 IncrementalValuesProvider<(MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>)> generateSingleStub = methodsToGenerate
 .Combine(stubEnvironment)
 .Combine(stubOptions)
 .Select(static (data, ct) => new
Expand DownExpand Up@@ -201,7 +201,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
 new MethodSignatureDiagnosticLocations(originalSyntax),
 jsImportData,
 CreateGeneratorFactory(environment, options),
 new SequenceEqualImmutableArray<Diagnostic>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 new SequenceEqualImmutableArray<DiagnosticInfo>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 }

 private static MarshallingGeneratorFactoryKey<(TargetFramework, Version, JSGeneratorOptions)> CreateGeneratorFactory(StubEnvironment env, JSGeneratorOptions options)
Expand All@@ -211,7 +211,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
 return MarshallingGeneratorFactoryKey.Create((env.TargetFramework, env.TargetFrameworkVersion, options), jsGeneratorFactory);
 }

 private static (MemberDeclarationSyntax, ImmutableArray<Diagnostic>) GenerateSource(
 private static (MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>) GenerateSource(
 IncrementalStubGenerationContext incrementalContext)
 {
 var diagnostics = new GeneratorDiagnostics();
Expand Down

2 changes: 1 addition & 1 deletion
...ropServices/gen/ComInterfaceGenerator/Analyzers/GeneratedComInterfaceAttributeAnalyzer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ public override void Initialize(AnalysisContext context)
 && GetAttribute(typeSymbol, TypeNames.InterfaceTypeAttribute, out AttributeData? comInterfaceAttribute)
 && !InterfaceTypeAttributeIsSupported(comInterfaceAttribute, out string unsupportedValue))
 {
 context.ReportDiagnostic(comInterfaceAttribute.CreateDiagnostic(AnalyzerDiagnostics.InterfaceTypeNotSupported, unsupportedValue));
 context.ReportDiagnostic(comInterfaceAttribute.CreateDiagnosticInfo(AnalyzerDiagnostics.InterfaceTypeNotSupported, unsupportedValue).ToDiagnostic());
 }
 }, SymbolKind.NamedType);
 }
Expand Down

4 changes: 2 additions & 2 deletions
...libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComInterfaceContext.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,9 +57,9 @@ DiagnosticOr<ComInterfaceContext> AddContext(ComInterfaceInfo iface)
 {
 // The base has failed generation at some point, so this interface cannot be generated
 var diagnostic = DiagnosticOr<ComInterfaceContext>.From(
Diagnostic.Create(
DiagnosticInfo.Create(
 GeneratorDiagnostics.BaseInterfaceIsNotGenerated,
 iface.DiagnosticLocation.AsLocation(), iface.ThisInterfaceKey, iface.BaseInterfaceKey));
 iface.DiagnosticLocation, iface.ThisInterfaceKey, iface.BaseInterfaceKey));
 nameToContextCache[iface.ThisInterfaceKey] = diagnostic;
 return diagnostic;
 }
Expand Down
Loading

, '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" + '
Create DiagnosticInfo as an incremental Diagnostic replacement type. by jtschuster · Pull Request #86908 · dotnet/runtime · GitHub
Skip to content
Create DiagnosticInfo as an incremental Diagnostic replacement type.#86908

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

jtschuster
merged 7 commits into

from

Jun 2, 2023
 Merged


Create DiagnosticInfo as an incremental Diagnostic replacement type.
#86908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
6cbc44c

wip - build crashes on refs


jtschuster May 26, 2023
5cb008f

wip


jtschuster May 26, 2023
355fe17

wip


jtschuster May 26, 2023
cab2abf

wip


jtschuster May 26, 2023
7319660

Use Location and revert csprojs


jtschuster May 26, 2023
094a593

Re-add the old Diagnostic APIs to Microsoft.Interop.SourceGeneration


jtschuster May 30, 2023
68dac3b

Don't qualify Location


jtschuster May 31, 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


8 changes: 4 additions & 4 deletions
src/libraries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/Comparers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,11 @@ internal static class Comparers
 /// <summary>
 /// Comparer for an individual generated stub source as a syntax tree and the generated diagnostics for the stub.
 /// </summary>
 public static readonly IEqualityComparer<(MemberDeclarationSyntax Syntax, ImmutableArray<Diagnostic> Diagnostics)> GeneratedSyntax = new CustomValueTupleElementComparer<MemberDeclarationSyntax, ImmutableArray<Diagnostic>>(SyntaxEquivalentComparer.Instance, new ImmutableArraySequenceEqualComparer<Diagnostic>(EqualityComparer<Diagnostic>.Default));
 public static readonly IEqualityComparer<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>)> GeneratedSyntax4 =
 new CustomValueTupleElementComparer<MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>>(
 public static readonly IEqualityComparer<(MemberDeclarationSyntax Syntax, ImmutableArray<DiagnosticInfo> Diagnostics)> GeneratedSyntax = new CustomValueTupleElementComparer<MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>>(SyntaxEquivalentComparer.Instance, new ImmutableArraySequenceEqualComparer<DiagnosticInfo>(EqualityComparer<DiagnosticInfo>.Default));
 public static readonly IEqualityComparer<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>)> GeneratedSyntax4 =
 new CustomValueTupleElementComparer<MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>>(
 SyntaxEquivalentComparer.Instance, SyntaxEquivalentComparer.Instance, SyntaxEquivalentComparer.Instance,
 new ImmutableArraySequenceEqualComparer<Diagnostic>(EqualityComparer<Diagnostic>.Default));
 new ImmutableArraySequenceEqualComparer<DiagnosticInfo>(EqualityComparer<DiagnosticInfo>.Default));
 }

 /// <summary>
Expand Down

22 changes: 11 additions & 11 deletions
...s/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/GeneratorDiagnostics.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,17 +28,17 @@ public class Ids
 }

 private const string Category = "JSImportGenerator";
 private readonly List<Diagnostic> _diagnostics = new List<Diagnostic>();
 private readonly List<DiagnosticInfo> _diagnostics = new List<DiagnosticInfo>();

 public IEnumerable<Diagnostic> Diagnostics => _diagnostics;
 public IEnumerable<DiagnosticInfo> Diagnostics => _diagnostics;

 public void ReportInvalidMarshallingAttributeInfo(
 AttributeData attributeData,
 string reasonResourceName,
 params string[] reasonArgs)
 {
 _diagnostics.Add(
 attributeData.CreateDiagnostic(
 attributeData.CreateDiagnosticInfo(
 GeneratorDiagnostics.MarshallingAttributeConfigurationNotSupported,
 new LocalizableResourceString(reasonResourceName, SR.ResourceManager, typeof(FxResources.Microsoft.Interop.JavaScript.JSImportGenerator.SR), reasonArgs)));
 }
Expand All@@ -57,14 +57,14 @@ public void ReportConfigurationNotSupported(
 if (unsupportedValue == null)
 {
 _diagnostics.Add(
 attributeData.CreateDiagnostic(
 attributeData.CreateDiagnosticInfo(
 GeneratorDiagnostics.ConfigurationNotSupported,
 configurationName));
 }
 else
 {
 _diagnostics.Add(
 attributeData.CreateDiagnostic(
 attributeData.CreateDiagnosticInfo(
 GeneratorDiagnostics.ConfigurationValueNotSupported,
 unsupportedValue,
 configurationName));
Expand DownExpand Up@@ -104,7 +104,7 @@ public void ReportMarshallingNotSupported(
 if (info.IsManagedReturnPosition)
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ReturnTypeNotSupportedWithDetails,
 diagnosticProperties,
 notSupportedDetails!,
Expand All@@ -113,7 +113,7 @@ public void ReportMarshallingNotSupported(
 else
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails,
 diagnosticProperties,
 notSupportedDetails!,
Expand All@@ -128,7 +128,7 @@ public void ReportMarshallingNotSupported(
 if (info.IsManagedReturnPosition)
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ReturnConfigurationNotSupported,
 diagnosticProperties,
 nameof(System.Runtime.InteropServices.MarshalAsAttribute),
Expand All@@ -137,7 +137,7 @@ public void ReportMarshallingNotSupported(
 else
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ParameterConfigurationNotSupported,
 diagnosticProperties,
 nameof(System.Runtime.InteropServices.MarshalAsAttribute),
Expand All@@ -150,7 +150,7 @@ public void ReportMarshallingNotSupported(
 if (info.IsManagedReturnPosition)
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ReturnTypeNotSupported,
 diagnosticProperties,
 info.ManagedType.DiagnosticFormattedName,
Expand All@@ -159,7 +159,7 @@ public void ReportMarshallingNotSupported(
 else
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ParameterTypeNotSupported,
 diagnosticProperties,
 info.ManagedType.DiagnosticFormattedName,
Expand Down

12 changes: 6 additions & 6 deletions
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSExportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ internal sealed record IncrementalStubGenerationContext(
 MethodSignatureDiagnosticLocations DiagnosticLocation,
 JSExportData JSExportData,
 MarshallingGeneratorFactoryKey<(TargetFramework TargetFramework, Version TargetFrameworkVersion, JSGeneratorOptions)> GeneratorFactoryKey,
 SequenceEqualImmutableArray<Diagnostic> Diagnostics);
 SequenceEqualImmutableArray<DiagnosticInfo> Diagnostics);

 public static class StepNames
 {
Expand DownExpand Up@@ -69,13 +69,13 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 if (data.Right.IsEmpty // no attributed methods
 || data.Left.Compilation.Options is CSharpCompilationOptions { AllowUnsafe: true }) // Unsafe code enabled
 {
 return ImmutableArray<Diagnostic>.Empty;
 return ImmutableArray<DiagnosticInfo>.Empty;
 }

 return ImmutableArray.Create(Diagnostic.Create(GeneratorDiagnostics.JSExportRequiresAllowUnsafeBlocks, null));
 return ImmutableArray.Create(DiagnosticInfo.Create(GeneratorDiagnostics.JSExportRequiresAllowUnsafeBlocks, null));
 }));

 IncrementalValuesProvider<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>)> generateSingleStub = methodsToGenerate
 IncrementalValuesProvider<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>)> generateSingleStub = methodsToGenerate
 .Combine(stubEnvironment)
 .Combine(stubOptions)
 .Select(static (data, ct) => new
Expand DownExpand Up@@ -214,7 +214,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
 new MethodSignatureDiagnosticLocations(originalSyntax),
 jsExportData,
 CreateGeneratorFactory(environment, options),
 new SequenceEqualImmutableArray<Diagnostic>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 new SequenceEqualImmutableArray<DiagnosticInfo>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 }

 private static MarshallingGeneratorFactoryKey<(TargetFramework, Version, JSGeneratorOptions)> CreateGeneratorFactory(StubEnvironment env, JSGeneratorOptions options)
Expand DownExpand Up@@ -286,7 +286,7 @@ private static NamespaceDeclarationSyntax GenerateRegSource(
 return ns;
 }

 private static (MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>) GenerateSource(
 private static (MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>) GenerateSource(
 IncrementalStubGenerationContext incrementalContext)
 {
 var diagnostics = new GeneratorDiagnostics();
Expand Down

12 changes: 6 additions & 6 deletions
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSImportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ internal sealed record IncrementalStubGenerationContext(
 MethodSignatureDiagnosticLocations DiagnosticLocation,
 JSImportData JSImportData,
 MarshallingGeneratorFactoryKey<(TargetFramework TargetFramework, Version TargetFrameworkVersion, JSGeneratorOptions)> GeneratorFactoryKey,
 SequenceEqualImmutableArray<Diagnostic> Diagnostics);
 SequenceEqualImmutableArray<DiagnosticInfo> Diagnostics);

 public static class StepNames
 {
Expand DownExpand Up@@ -69,13 +69,13 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 if (data.Right.IsEmpty // no attributed methods
 || data.Left.Compilation.Options is CSharpCompilationOptions { AllowUnsafe: true }) // Unsafe code enabled
 {
 return ImmutableArray<Diagnostic>.Empty;
 return ImmutableArray<DiagnosticInfo>.Empty;
 }

 return ImmutableArray.Create(Diagnostic.Create(GeneratorDiagnostics.JSImportRequiresAllowUnsafeBlocks, null));
 return ImmutableArray.Create(DiagnosticInfo.Create(GeneratorDiagnostics.JSImportRequiresAllowUnsafeBlocks, null));
 }));

 IncrementalValuesProvider<(MemberDeclarationSyntax, ImmutableArray<Diagnostic>)> generateSingleStub = methodsToGenerate
 IncrementalValuesProvider<(MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>)> generateSingleStub = methodsToGenerate
 .Combine(stubEnvironment)
 .Combine(stubOptions)
 .Select(static (data, ct) => new
Expand DownExpand Up@@ -201,7 +201,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
 new MethodSignatureDiagnosticLocations(originalSyntax),
 jsImportData,
 CreateGeneratorFactory(environment, options),
 new SequenceEqualImmutableArray<Diagnostic>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 new SequenceEqualImmutableArray<DiagnosticInfo>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 }

 private static MarshallingGeneratorFactoryKey<(TargetFramework, Version, JSGeneratorOptions)> CreateGeneratorFactory(StubEnvironment env, JSGeneratorOptions options)
Expand All@@ -211,7 +211,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
 return MarshallingGeneratorFactoryKey.Create((env.TargetFramework, env.TargetFrameworkVersion, options), jsGeneratorFactory);
 }

 private static (MemberDeclarationSyntax, ImmutableArray<Diagnostic>) GenerateSource(
 private static (MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>) GenerateSource(
 IncrementalStubGenerationContext incrementalContext)
 {
 var diagnostics = new GeneratorDiagnostics();
Expand Down

2 changes: 1 addition & 1 deletion
...ropServices/gen/ComInterfaceGenerator/Analyzers/GeneratedComInterfaceAttributeAnalyzer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ public override void Initialize(AnalysisContext context)
 && GetAttribute(typeSymbol, TypeNames.InterfaceTypeAttribute, out AttributeData? comInterfaceAttribute)
 && !InterfaceTypeAttributeIsSupported(comInterfaceAttribute, out string unsupportedValue))
 {
 context.ReportDiagnostic(comInterfaceAttribute.CreateDiagnostic(AnalyzerDiagnostics.InterfaceTypeNotSupported, unsupportedValue));
 context.ReportDiagnostic(comInterfaceAttribute.CreateDiagnosticInfo(AnalyzerDiagnostics.InterfaceTypeNotSupported, unsupportedValue).ToDiagnostic());
 }
 }, SymbolKind.NamedType);
 }
Expand Down

4 changes: 2 additions & 2 deletions
...libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComInterfaceContext.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,9 +57,9 @@ DiagnosticOr<ComInterfaceContext> AddContext(ComInterfaceInfo iface)
 {
 // The base has failed generation at some point, so this interface cannot be generated
 var diagnostic = DiagnosticOr<ComInterfaceContext>.From(
Diagnostic.Create(
DiagnosticInfo.Create(
 GeneratorDiagnostics.BaseInterfaceIsNotGenerated,
 iface.DiagnosticLocation.AsLocation(), iface.ThisInterfaceKey, iface.BaseInterfaceKey));
 iface.DiagnosticLocation, iface.ThisInterfaceKey, iface.BaseInterfaceKey));
 nameToContextCache[iface.ThisInterfaceKey] = diagnostic;
 return diagnostic;
 }
Expand Down
Loading

, '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('^' + ".*" + '
Create DiagnosticInfo as an incremental Diagnostic replacement type. by jtschuster · Pull Request #86908 · dotnet/runtime · GitHub
Skip to content
Create DiagnosticInfo as an incremental Diagnostic replacement type.#86908

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

jtschuster
merged 7 commits into

from

Jun 2, 2023
 Merged


Create DiagnosticInfo as an incremental Diagnostic replacement type.
#86908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
6cbc44c

wip - build crashes on refs


jtschuster May 26, 2023
5cb008f

wip


jtschuster May 26, 2023
355fe17

wip


jtschuster May 26, 2023
cab2abf

wip


jtschuster May 26, 2023
7319660

Use Location and revert csprojs


jtschuster May 26, 2023
094a593

Re-add the old Diagnostic APIs to Microsoft.Interop.SourceGeneration


jtschuster May 30, 2023
68dac3b

Don't qualify Location


jtschuster May 31, 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


8 changes: 4 additions & 4 deletions
src/libraries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/Comparers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,11 @@ internal static class Comparers
 /// <summary>
 /// Comparer for an individual generated stub source as a syntax tree and the generated diagnostics for the stub.
 /// </summary>
 public static readonly IEqualityComparer<(MemberDeclarationSyntax Syntax, ImmutableArray<Diagnostic> Diagnostics)> GeneratedSyntax = new CustomValueTupleElementComparer<MemberDeclarationSyntax, ImmutableArray<Diagnostic>>(SyntaxEquivalentComparer.Instance, new ImmutableArraySequenceEqualComparer<Diagnostic>(EqualityComparer<Diagnostic>.Default));
 public static readonly IEqualityComparer<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>)> GeneratedSyntax4 =
 new CustomValueTupleElementComparer<MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>>(
 public static readonly IEqualityComparer<(MemberDeclarationSyntax Syntax, ImmutableArray<DiagnosticInfo> Diagnostics)> GeneratedSyntax = new CustomValueTupleElementComparer<MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>>(SyntaxEquivalentComparer.Instance, new ImmutableArraySequenceEqualComparer<DiagnosticInfo>(EqualityComparer<DiagnosticInfo>.Default));
 public static readonly IEqualityComparer<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>)> GeneratedSyntax4 =
 new CustomValueTupleElementComparer<MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>>(
 SyntaxEquivalentComparer.Instance, SyntaxEquivalentComparer.Instance, SyntaxEquivalentComparer.Instance,
 new ImmutableArraySequenceEqualComparer<Diagnostic>(EqualityComparer<Diagnostic>.Default));
 new ImmutableArraySequenceEqualComparer<DiagnosticInfo>(EqualityComparer<DiagnosticInfo>.Default));
 }

 /// <summary>
Expand Down

22 changes: 11 additions & 11 deletions
...s/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/GeneratorDiagnostics.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,17 +28,17 @@ public class Ids
 }

 private const string Category = "JSImportGenerator";
 private readonly List<Diagnostic> _diagnostics = new List<Diagnostic>();
 private readonly List<DiagnosticInfo> _diagnostics = new List<DiagnosticInfo>();

 public IEnumerable<Diagnostic> Diagnostics => _diagnostics;
 public IEnumerable<DiagnosticInfo> Diagnostics => _diagnostics;

 public void ReportInvalidMarshallingAttributeInfo(
 AttributeData attributeData,
 string reasonResourceName,
 params string[] reasonArgs)
 {
 _diagnostics.Add(
 attributeData.CreateDiagnostic(
 attributeData.CreateDiagnosticInfo(
 GeneratorDiagnostics.MarshallingAttributeConfigurationNotSupported,
 new LocalizableResourceString(reasonResourceName, SR.ResourceManager, typeof(FxResources.Microsoft.Interop.JavaScript.JSImportGenerator.SR), reasonArgs)));
 }
Expand All@@ -57,14 +57,14 @@ public void ReportConfigurationNotSupported(
 if (unsupportedValue == null)
 {
 _diagnostics.Add(
 attributeData.CreateDiagnostic(
 attributeData.CreateDiagnosticInfo(
 GeneratorDiagnostics.ConfigurationNotSupported,
 configurationName));
 }
 else
 {
 _diagnostics.Add(
 attributeData.CreateDiagnostic(
 attributeData.CreateDiagnosticInfo(
 GeneratorDiagnostics.ConfigurationValueNotSupported,
 unsupportedValue,
 configurationName));
Expand DownExpand Up@@ -104,7 +104,7 @@ public void ReportMarshallingNotSupported(
 if (info.IsManagedReturnPosition)
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ReturnTypeNotSupportedWithDetails,
 diagnosticProperties,
 notSupportedDetails!,
Expand All@@ -113,7 +113,7 @@ public void ReportMarshallingNotSupported(
 else
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails,
 diagnosticProperties,
 notSupportedDetails!,
Expand All@@ -128,7 +128,7 @@ public void ReportMarshallingNotSupported(
 if (info.IsManagedReturnPosition)
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ReturnConfigurationNotSupported,
 diagnosticProperties,
 nameof(System.Runtime.InteropServices.MarshalAsAttribute),
Expand All@@ -137,7 +137,7 @@ public void ReportMarshallingNotSupported(
 else
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ParameterConfigurationNotSupported,
 diagnosticProperties,
 nameof(System.Runtime.InteropServices.MarshalAsAttribute),
Expand All@@ -150,7 +150,7 @@ public void ReportMarshallingNotSupported(
 if (info.IsManagedReturnPosition)
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ReturnTypeNotSupported,
 diagnosticProperties,
 info.ManagedType.DiagnosticFormattedName,
Expand All@@ -159,7 +159,7 @@ public void ReportMarshallingNotSupported(
 else
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ParameterTypeNotSupported,
 diagnosticProperties,
 info.ManagedType.DiagnosticFormattedName,
Expand Down

12 changes: 6 additions & 6 deletions
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSExportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ internal sealed record IncrementalStubGenerationContext(
 MethodSignatureDiagnosticLocations DiagnosticLocation,
 JSExportData JSExportData,
 MarshallingGeneratorFactoryKey<(TargetFramework TargetFramework, Version TargetFrameworkVersion, JSGeneratorOptions)> GeneratorFactoryKey,
 SequenceEqualImmutableArray<Diagnostic> Diagnostics);
 SequenceEqualImmutableArray<DiagnosticInfo> Diagnostics);

 public static class StepNames
 {
Expand DownExpand Up@@ -69,13 +69,13 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 if (data.Right.IsEmpty // no attributed methods
 || data.Left.Compilation.Options is CSharpCompilationOptions { AllowUnsafe: true }) // Unsafe code enabled
 {
 return ImmutableArray<Diagnostic>.Empty;
 return ImmutableArray<DiagnosticInfo>.Empty;
 }

 return ImmutableArray.Create(Diagnostic.Create(GeneratorDiagnostics.JSExportRequiresAllowUnsafeBlocks, null));
 return ImmutableArray.Create(DiagnosticInfo.Create(GeneratorDiagnostics.JSExportRequiresAllowUnsafeBlocks, null));
 }));

 IncrementalValuesProvider<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>)> generateSingleStub = methodsToGenerate
 IncrementalValuesProvider<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>)> generateSingleStub = methodsToGenerate
 .Combine(stubEnvironment)
 .Combine(stubOptions)
 .Select(static (data, ct) => new
Expand DownExpand Up@@ -214,7 +214,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
 new MethodSignatureDiagnosticLocations(originalSyntax),
 jsExportData,
 CreateGeneratorFactory(environment, options),
 new SequenceEqualImmutableArray<Diagnostic>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 new SequenceEqualImmutableArray<DiagnosticInfo>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 }

 private static MarshallingGeneratorFactoryKey<(TargetFramework, Version, JSGeneratorOptions)> CreateGeneratorFactory(StubEnvironment env, JSGeneratorOptions options)
Expand DownExpand Up@@ -286,7 +286,7 @@ private static NamespaceDeclarationSyntax GenerateRegSource(
 return ns;
 }

 private static (MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>) GenerateSource(
 private static (MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>) GenerateSource(
 IncrementalStubGenerationContext incrementalContext)
 {
 var diagnostics = new GeneratorDiagnostics();
Expand Down

12 changes: 6 additions & 6 deletions
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSImportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ internal sealed record IncrementalStubGenerationContext(
 MethodSignatureDiagnosticLocations DiagnosticLocation,
 JSImportData JSImportData,
 MarshallingGeneratorFactoryKey<(TargetFramework TargetFramework, Version TargetFrameworkVersion, JSGeneratorOptions)> GeneratorFactoryKey,
 SequenceEqualImmutableArray<Diagnostic> Diagnostics);
 SequenceEqualImmutableArray<DiagnosticInfo> Diagnostics);

 public static class StepNames
 {
Expand DownExpand Up@@ -69,13 +69,13 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 if (data.Right.IsEmpty // no attributed methods
 || data.Left.Compilation.Options is CSharpCompilationOptions { AllowUnsafe: true }) // Unsafe code enabled
 {
 return ImmutableArray<Diagnostic>.Empty;
 return ImmutableArray<DiagnosticInfo>.Empty;
 }

 return ImmutableArray.Create(Diagnostic.Create(GeneratorDiagnostics.JSImportRequiresAllowUnsafeBlocks, null));
 return ImmutableArray.Create(DiagnosticInfo.Create(GeneratorDiagnostics.JSImportRequiresAllowUnsafeBlocks, null));
 }));

 IncrementalValuesProvider<(MemberDeclarationSyntax, ImmutableArray<Diagnostic>)> generateSingleStub = methodsToGenerate
 IncrementalValuesProvider<(MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>)> generateSingleStub = methodsToGenerate
 .Combine(stubEnvironment)
 .Combine(stubOptions)
 .Select(static (data, ct) => new
Expand DownExpand Up@@ -201,7 +201,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
 new MethodSignatureDiagnosticLocations(originalSyntax),
 jsImportData,
 CreateGeneratorFactory(environment, options),
 new SequenceEqualImmutableArray<Diagnostic>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 new SequenceEqualImmutableArray<DiagnosticInfo>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 }

 private static MarshallingGeneratorFactoryKey<(TargetFramework, Version, JSGeneratorOptions)> CreateGeneratorFactory(StubEnvironment env, JSGeneratorOptions options)
Expand All@@ -211,7 +211,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
 return MarshallingGeneratorFactoryKey.Create((env.TargetFramework, env.TargetFrameworkVersion, options), jsGeneratorFactory);
 }

 private static (MemberDeclarationSyntax, ImmutableArray<Diagnostic>) GenerateSource(
 private static (MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>) GenerateSource(
 IncrementalStubGenerationContext incrementalContext)
 {
 var diagnostics = new GeneratorDiagnostics();
Expand Down

2 changes: 1 addition & 1 deletion
...ropServices/gen/ComInterfaceGenerator/Analyzers/GeneratedComInterfaceAttributeAnalyzer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ public override void Initialize(AnalysisContext context)
 && GetAttribute(typeSymbol, TypeNames.InterfaceTypeAttribute, out AttributeData? comInterfaceAttribute)
 && !InterfaceTypeAttributeIsSupported(comInterfaceAttribute, out string unsupportedValue))
 {
 context.ReportDiagnostic(comInterfaceAttribute.CreateDiagnostic(AnalyzerDiagnostics.InterfaceTypeNotSupported, unsupportedValue));
 context.ReportDiagnostic(comInterfaceAttribute.CreateDiagnosticInfo(AnalyzerDiagnostics.InterfaceTypeNotSupported, unsupportedValue).ToDiagnostic());
 }
 }, SymbolKind.NamedType);
 }
Expand Down

4 changes: 2 additions & 2 deletions
...libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComInterfaceContext.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,9 +57,9 @@ DiagnosticOr<ComInterfaceContext> AddContext(ComInterfaceInfo iface)
 {
 // The base has failed generation at some point, so this interface cannot be generated
 var diagnostic = DiagnosticOr<ComInterfaceContext>.From(
Diagnostic.Create(
DiagnosticInfo.Create(
 GeneratorDiagnostics.BaseInterfaceIsNotGenerated,
 iface.DiagnosticLocation.AsLocation(), iface.ThisInterfaceKey, iface.BaseInterfaceKey));
 iface.DiagnosticLocation, iface.ThisInterfaceKey, iface.BaseInterfaceKey));
 nameToContextCache[iface.ThisInterfaceKey] = diagnostic;
 return diagnostic;
 }
Expand Down
Loading

, '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('^' + ".*" + '
Create DiagnosticInfo as an incremental Diagnostic replacement type. by jtschuster · Pull Request #86908 · dotnet/runtime · GitHub
Skip to content
Create DiagnosticInfo as an incremental Diagnostic replacement type.#86908

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

jtschuster
merged 7 commits into

from

Jun 2, 2023
 Merged


Create DiagnosticInfo as an incremental Diagnostic replacement type.
#86908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
6cbc44c

wip - build crashes on refs


jtschuster May 26, 2023
5cb008f

wip


jtschuster May 26, 2023
355fe17

wip


jtschuster May 26, 2023
cab2abf

wip


jtschuster May 26, 2023
7319660

Use Location and revert csprojs


jtschuster May 26, 2023
094a593

Re-add the old Diagnostic APIs to Microsoft.Interop.SourceGeneration


jtschuster May 30, 2023
68dac3b

Don't qualify Location


jtschuster May 31, 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


8 changes: 4 additions & 4 deletions
src/libraries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/Comparers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,11 @@ internal static class Comparers
 /// <summary>
 /// Comparer for an individual generated stub source as a syntax tree and the generated diagnostics for the stub.
 /// </summary>
 public static readonly IEqualityComparer<(MemberDeclarationSyntax Syntax, ImmutableArray<Diagnostic> Diagnostics)> GeneratedSyntax = new CustomValueTupleElementComparer<MemberDeclarationSyntax, ImmutableArray<Diagnostic>>(SyntaxEquivalentComparer.Instance, new ImmutableArraySequenceEqualComparer<Diagnostic>(EqualityComparer<Diagnostic>.Default));
 public static readonly IEqualityComparer<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>)> GeneratedSyntax4 =
 new CustomValueTupleElementComparer<MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>>(
 public static readonly IEqualityComparer<(MemberDeclarationSyntax Syntax, ImmutableArray<DiagnosticInfo> Diagnostics)> GeneratedSyntax = new CustomValueTupleElementComparer<MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>>(SyntaxEquivalentComparer.Instance, new ImmutableArraySequenceEqualComparer<DiagnosticInfo>(EqualityComparer<DiagnosticInfo>.Default));
 public static readonly IEqualityComparer<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>)> GeneratedSyntax4 =
 new CustomValueTupleElementComparer<MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>>(
 SyntaxEquivalentComparer.Instance, SyntaxEquivalentComparer.Instance, SyntaxEquivalentComparer.Instance,
 new ImmutableArraySequenceEqualComparer<Diagnostic>(EqualityComparer<Diagnostic>.Default));
 new ImmutableArraySequenceEqualComparer<DiagnosticInfo>(EqualityComparer<DiagnosticInfo>.Default));
 }

 /// <summary>
Expand Down

22 changes: 11 additions & 11 deletions
...s/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/GeneratorDiagnostics.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,17 +28,17 @@ public class Ids
 }

 private const string Category = "JSImportGenerator";
 private readonly List<Diagnostic> _diagnostics = new List<Diagnostic>();
 private readonly List<DiagnosticInfo> _diagnostics = new List<DiagnosticInfo>();

 public IEnumerable<Diagnostic> Diagnostics => _diagnostics;
 public IEnumerable<DiagnosticInfo> Diagnostics => _diagnostics;

 public void ReportInvalidMarshallingAttributeInfo(
 AttributeData attributeData,
 string reasonResourceName,
 params string[] reasonArgs)
 {
 _diagnostics.Add(
 attributeData.CreateDiagnostic(
 attributeData.CreateDiagnosticInfo(
 GeneratorDiagnostics.MarshallingAttributeConfigurationNotSupported,
 new LocalizableResourceString(reasonResourceName, SR.ResourceManager, typeof(FxResources.Microsoft.Interop.JavaScript.JSImportGenerator.SR), reasonArgs)));
 }
Expand All@@ -57,14 +57,14 @@ public void ReportConfigurationNotSupported(
 if (unsupportedValue == null)
 {
 _diagnostics.Add(
 attributeData.CreateDiagnostic(
 attributeData.CreateDiagnosticInfo(
 GeneratorDiagnostics.ConfigurationNotSupported,
 configurationName));
 }
 else
 {
 _diagnostics.Add(
 attributeData.CreateDiagnostic(
 attributeData.CreateDiagnosticInfo(
 GeneratorDiagnostics.ConfigurationValueNotSupported,
 unsupportedValue,
 configurationName));
Expand DownExpand Up@@ -104,7 +104,7 @@ public void ReportMarshallingNotSupported(
 if (info.IsManagedReturnPosition)
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ReturnTypeNotSupportedWithDetails,
 diagnosticProperties,
 notSupportedDetails!,
Expand All@@ -113,7 +113,7 @@ public void ReportMarshallingNotSupported(
 else
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails,
 diagnosticProperties,
 notSupportedDetails!,
Expand All@@ -128,7 +128,7 @@ public void ReportMarshallingNotSupported(
 if (info.IsManagedReturnPosition)
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ReturnConfigurationNotSupported,
 diagnosticProperties,
 nameof(System.Runtime.InteropServices.MarshalAsAttribute),
Expand All@@ -137,7 +137,7 @@ public void ReportMarshallingNotSupported(
 else
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ParameterConfigurationNotSupported,
 diagnosticProperties,
 nameof(System.Runtime.InteropServices.MarshalAsAttribute),
Expand All@@ -150,7 +150,7 @@ public void ReportMarshallingNotSupported(
 if (info.IsManagedReturnPosition)
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ReturnTypeNotSupported,
 diagnosticProperties,
 info.ManagedType.DiagnosticFormattedName,
Expand All@@ -159,7 +159,7 @@ public void ReportMarshallingNotSupported(
 else
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ParameterTypeNotSupported,
 diagnosticProperties,
 info.ManagedType.DiagnosticFormattedName,
Expand Down

12 changes: 6 additions & 6 deletions
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSExportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ internal sealed record IncrementalStubGenerationContext(
 MethodSignatureDiagnosticLocations DiagnosticLocation,
 JSExportData JSExportData,
 MarshallingGeneratorFactoryKey<(TargetFramework TargetFramework, Version TargetFrameworkVersion, JSGeneratorOptions)> GeneratorFactoryKey,
 SequenceEqualImmutableArray<Diagnostic> Diagnostics);
 SequenceEqualImmutableArray<DiagnosticInfo> Diagnostics);

 public static class StepNames
 {
Expand DownExpand Up@@ -69,13 +69,13 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 if (data.Right.IsEmpty // no attributed methods
 || data.Left.Compilation.Options is CSharpCompilationOptions { AllowUnsafe: true }) // Unsafe code enabled
 {
 return ImmutableArray<Diagnostic>.Empty;
 return ImmutableArray<DiagnosticInfo>.Empty;
 }

 return ImmutableArray.Create(Diagnostic.Create(GeneratorDiagnostics.JSExportRequiresAllowUnsafeBlocks, null));
 return ImmutableArray.Create(DiagnosticInfo.Create(GeneratorDiagnostics.JSExportRequiresAllowUnsafeBlocks, null));
 }));

 IncrementalValuesProvider<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>)> generateSingleStub = methodsToGenerate
 IncrementalValuesProvider<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>)> generateSingleStub = methodsToGenerate
 .Combine(stubEnvironment)
 .Combine(stubOptions)
 .Select(static (data, ct) => new
Expand DownExpand Up@@ -214,7 +214,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
 new MethodSignatureDiagnosticLocations(originalSyntax),
 jsExportData,
 CreateGeneratorFactory(environment, options),
 new SequenceEqualImmutableArray<Diagnostic>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 new SequenceEqualImmutableArray<DiagnosticInfo>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 }

 private static MarshallingGeneratorFactoryKey<(TargetFramework, Version, JSGeneratorOptions)> CreateGeneratorFactory(StubEnvironment env, JSGeneratorOptions options)
Expand DownExpand Up@@ -286,7 +286,7 @@ private static NamespaceDeclarationSyntax GenerateRegSource(
 return ns;
 }

 private static (MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>) GenerateSource(
 private static (MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>) GenerateSource(
 IncrementalStubGenerationContext incrementalContext)
 {
 var diagnostics = new GeneratorDiagnostics();
Expand Down

12 changes: 6 additions & 6 deletions
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSImportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ internal sealed record IncrementalStubGenerationContext(
 MethodSignatureDiagnosticLocations DiagnosticLocation,
 JSImportData JSImportData,
 MarshallingGeneratorFactoryKey<(TargetFramework TargetFramework, Version TargetFrameworkVersion, JSGeneratorOptions)> GeneratorFactoryKey,
 SequenceEqualImmutableArray<Diagnostic> Diagnostics);
 SequenceEqualImmutableArray<DiagnosticInfo> Diagnostics);

 public static class StepNames
 {
Expand DownExpand Up@@ -69,13 +69,13 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 if (data.Right.IsEmpty // no attributed methods
 || data.Left.Compilation.Options is CSharpCompilationOptions { AllowUnsafe: true }) // Unsafe code enabled
 {
 return ImmutableArray<Diagnostic>.Empty;
 return ImmutableArray<DiagnosticInfo>.Empty;
 }

 return ImmutableArray.Create(Diagnostic.Create(GeneratorDiagnostics.JSImportRequiresAllowUnsafeBlocks, null));
 return ImmutableArray.Create(DiagnosticInfo.Create(GeneratorDiagnostics.JSImportRequiresAllowUnsafeBlocks, null));
 }));

 IncrementalValuesProvider<(MemberDeclarationSyntax, ImmutableArray<Diagnostic>)> generateSingleStub = methodsToGenerate
 IncrementalValuesProvider<(MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>)> generateSingleStub = methodsToGenerate
 .Combine(stubEnvironment)
 .Combine(stubOptions)
 .Select(static (data, ct) => new
Expand DownExpand Up@@ -201,7 +201,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
 new MethodSignatureDiagnosticLocations(originalSyntax),
 jsImportData,
 CreateGeneratorFactory(environment, options),
 new SequenceEqualImmutableArray<Diagnostic>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 new SequenceEqualImmutableArray<DiagnosticInfo>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 }

 private static MarshallingGeneratorFactoryKey<(TargetFramework, Version, JSGeneratorOptions)> CreateGeneratorFactory(StubEnvironment env, JSGeneratorOptions options)
Expand All@@ -211,7 +211,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
 return MarshallingGeneratorFactoryKey.Create((env.TargetFramework, env.TargetFrameworkVersion, options), jsGeneratorFactory);
 }

 private static (MemberDeclarationSyntax, ImmutableArray<Diagnostic>) GenerateSource(
 private static (MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>) GenerateSource(
 IncrementalStubGenerationContext incrementalContext)
 {
 var diagnostics = new GeneratorDiagnostics();
Expand Down

2 changes: 1 addition & 1 deletion
...ropServices/gen/ComInterfaceGenerator/Analyzers/GeneratedComInterfaceAttributeAnalyzer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ public override void Initialize(AnalysisContext context)
 && GetAttribute(typeSymbol, TypeNames.InterfaceTypeAttribute, out AttributeData? comInterfaceAttribute)
 && !InterfaceTypeAttributeIsSupported(comInterfaceAttribute, out string unsupportedValue))
 {
 context.ReportDiagnostic(comInterfaceAttribute.CreateDiagnostic(AnalyzerDiagnostics.InterfaceTypeNotSupported, unsupportedValue));
 context.ReportDiagnostic(comInterfaceAttribute.CreateDiagnosticInfo(AnalyzerDiagnostics.InterfaceTypeNotSupported, unsupportedValue).ToDiagnostic());
 }
 }, SymbolKind.NamedType);
 }
Expand Down

4 changes: 2 additions & 2 deletions
...libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComInterfaceContext.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,9 +57,9 @@ DiagnosticOr<ComInterfaceContext> AddContext(ComInterfaceInfo iface)
 {
 // The base has failed generation at some point, so this interface cannot be generated
 var diagnostic = DiagnosticOr<ComInterfaceContext>.From(
Diagnostic.Create(
DiagnosticInfo.Create(
 GeneratorDiagnostics.BaseInterfaceIsNotGenerated,
 iface.DiagnosticLocation.AsLocation(), iface.ThisInterfaceKey, iface.BaseInterfaceKey));
 iface.DiagnosticLocation, iface.ThisInterfaceKey, iface.BaseInterfaceKey));
 nameToContextCache[iface.ThisInterfaceKey] = diagnostic;
 return diagnostic;
 }
Expand Down
Loading

, '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); }
})();
})();
Create DiagnosticInfo as an incremental Diagnostic replacement type. by jtschuster · Pull Request #86908 · dotnet/runtime · GitHub
Skip to content
Create DiagnosticInfo as an incremental Diagnostic replacement type.#86908

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

jtschuster
merged 7 commits into

from

Jun 2, 2023
 Merged


Create DiagnosticInfo as an incremental Diagnostic replacement type.
#86908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
6cbc44c

wip - build crashes on refs


jtschuster May 26, 2023
5cb008f

wip


jtschuster May 26, 2023
355fe17

wip


jtschuster May 26, 2023
cab2abf

wip


jtschuster May 26, 2023
7319660

Use Location and revert csprojs


jtschuster May 26, 2023
094a593

Re-add the old Diagnostic APIs to Microsoft.Interop.SourceGeneration


jtschuster May 30, 2023
68dac3b

Don't qualify Location


jtschuster May 31, 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


8 changes: 4 additions & 4 deletions
src/libraries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/Comparers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,11 @@ internal static class Comparers
 /// <summary>
 /// Comparer for an individual generated stub source as a syntax tree and the generated diagnostics for the stub.
 /// </summary>
 public static readonly IEqualityComparer<(MemberDeclarationSyntax Syntax, ImmutableArray<Diagnostic> Diagnostics)> GeneratedSyntax = new CustomValueTupleElementComparer<MemberDeclarationSyntax, ImmutableArray<Diagnostic>>(SyntaxEquivalentComparer.Instance, new ImmutableArraySequenceEqualComparer<Diagnostic>(EqualityComparer<Diagnostic>.Default));
 public static readonly IEqualityComparer<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>)> GeneratedSyntax4 =
 new CustomValueTupleElementComparer<MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>>(
 public static readonly IEqualityComparer<(MemberDeclarationSyntax Syntax, ImmutableArray<DiagnosticInfo> Diagnostics)> GeneratedSyntax = new CustomValueTupleElementComparer<MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>>(SyntaxEquivalentComparer.Instance, new ImmutableArraySequenceEqualComparer<DiagnosticInfo>(EqualityComparer<DiagnosticInfo>.Default));
 public static readonly IEqualityComparer<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>)> GeneratedSyntax4 =
 new CustomValueTupleElementComparer<MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>>(
 SyntaxEquivalentComparer.Instance, SyntaxEquivalentComparer.Instance, SyntaxEquivalentComparer.Instance,
 new ImmutableArraySequenceEqualComparer<Diagnostic>(EqualityComparer<Diagnostic>.Default));
 new ImmutableArraySequenceEqualComparer<DiagnosticInfo>(EqualityComparer<DiagnosticInfo>.Default));
 }

 /// <summary>
Expand Down

22 changes: 11 additions & 11 deletions
...s/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/GeneratorDiagnostics.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,17 +28,17 @@ public class Ids
 }

 private const string Category = "JSImportGenerator";
 private readonly List<Diagnostic> _diagnostics = new List<Diagnostic>();
 private readonly List<DiagnosticInfo> _diagnostics = new List<DiagnosticInfo>();

 public IEnumerable<Diagnostic> Diagnostics => _diagnostics;
 public IEnumerable<DiagnosticInfo> Diagnostics => _diagnostics;

 public void ReportInvalidMarshallingAttributeInfo(
 AttributeData attributeData,
 string reasonResourceName,
 params string[] reasonArgs)
 {
 _diagnostics.Add(
 attributeData.CreateDiagnostic(
 attributeData.CreateDiagnosticInfo(
 GeneratorDiagnostics.MarshallingAttributeConfigurationNotSupported,
 new LocalizableResourceString(reasonResourceName, SR.ResourceManager, typeof(FxResources.Microsoft.Interop.JavaScript.JSImportGenerator.SR), reasonArgs)));
 }
Expand All@@ -57,14 +57,14 @@ public void ReportConfigurationNotSupported(
 if (unsupportedValue == null)
 {
 _diagnostics.Add(
 attributeData.CreateDiagnostic(
 attributeData.CreateDiagnosticInfo(
 GeneratorDiagnostics.ConfigurationNotSupported,
 configurationName));
 }
 else
 {
 _diagnostics.Add(
 attributeData.CreateDiagnostic(
 attributeData.CreateDiagnosticInfo(
 GeneratorDiagnostics.ConfigurationValueNotSupported,
 unsupportedValue,
 configurationName));
Expand DownExpand Up@@ -104,7 +104,7 @@ public void ReportMarshallingNotSupported(
 if (info.IsManagedReturnPosition)
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ReturnTypeNotSupportedWithDetails,
 diagnosticProperties,
 notSupportedDetails!,
Expand All@@ -113,7 +113,7 @@ public void ReportMarshallingNotSupported(
 else
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ParameterTypeNotSupportedWithDetails,
 diagnosticProperties,
 notSupportedDetails!,
Expand All@@ -128,7 +128,7 @@ public void ReportMarshallingNotSupported(
 if (info.IsManagedReturnPosition)
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ReturnConfigurationNotSupported,
 diagnosticProperties,
 nameof(System.Runtime.InteropServices.MarshalAsAttribute),
Expand All@@ -137,7 +137,7 @@ public void ReportMarshallingNotSupported(
 else
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ParameterConfigurationNotSupported,
 diagnosticProperties,
 nameof(System.Runtime.InteropServices.MarshalAsAttribute),
Expand All@@ -150,7 +150,7 @@ public void ReportMarshallingNotSupported(
 if (info.IsManagedReturnPosition)
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ReturnTypeNotSupported,
 diagnosticProperties,
 info.ManagedType.DiagnosticFormattedName,
Expand All@@ -159,7 +159,7 @@ public void ReportMarshallingNotSupported(
 else
 {
 _diagnostics.Add(
 diagnosticLocation.CreateDiagnostic(
 diagnosticLocation.CreateDiagnosticInfo(
 GeneratorDiagnostics.ParameterTypeNotSupported,
 diagnosticProperties,
 info.ManagedType.DiagnosticFormattedName,
Expand Down

12 changes: 6 additions & 6 deletions
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSExportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ internal sealed record IncrementalStubGenerationContext(
 MethodSignatureDiagnosticLocations DiagnosticLocation,
 JSExportData JSExportData,
 MarshallingGeneratorFactoryKey<(TargetFramework TargetFramework, Version TargetFrameworkVersion, JSGeneratorOptions)> GeneratorFactoryKey,
 SequenceEqualImmutableArray<Diagnostic> Diagnostics);
 SequenceEqualImmutableArray<DiagnosticInfo> Diagnostics);

 public static class StepNames
 {
Expand DownExpand Up@@ -69,13 +69,13 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 if (data.Right.IsEmpty // no attributed methods
 || data.Left.Compilation.Options is CSharpCompilationOptions { AllowUnsafe: true }) // Unsafe code enabled
 {
 return ImmutableArray<Diagnostic>.Empty;
 return ImmutableArray<DiagnosticInfo>.Empty;
 }

 return ImmutableArray.Create(Diagnostic.Create(GeneratorDiagnostics.JSExportRequiresAllowUnsafeBlocks, null));
 return ImmutableArray.Create(DiagnosticInfo.Create(GeneratorDiagnostics.JSExportRequiresAllowUnsafeBlocks, null));
 }));

 IncrementalValuesProvider<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>)> generateSingleStub = methodsToGenerate
 IncrementalValuesProvider<(MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>)> generateSingleStub = methodsToGenerate
 .Combine(stubEnvironment)
 .Combine(stubOptions)
 .Select(static (data, ct) => new
Expand DownExpand Up@@ -214,7 +214,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
 new MethodSignatureDiagnosticLocations(originalSyntax),
 jsExportData,
 CreateGeneratorFactory(environment, options),
 new SequenceEqualImmutableArray<Diagnostic>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 new SequenceEqualImmutableArray<DiagnosticInfo>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 }

 private static MarshallingGeneratorFactoryKey<(TargetFramework, Version, JSGeneratorOptions)> CreateGeneratorFactory(StubEnvironment env, JSGeneratorOptions options)
Expand DownExpand Up@@ -286,7 +286,7 @@ private static NamespaceDeclarationSyntax GenerateRegSource(
 return ns;
 }

 private static (MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<Diagnostic>) GenerateSource(
 private static (MemberDeclarationSyntax, StatementSyntax, AttributeListSyntax, ImmutableArray<DiagnosticInfo>) GenerateSource(
 IncrementalStubGenerationContext incrementalContext)
 {
 var diagnostics = new GeneratorDiagnostics();
Expand Down

12 changes: 6 additions & 6 deletions
...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSImportGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ internal sealed record IncrementalStubGenerationContext(
 MethodSignatureDiagnosticLocations DiagnosticLocation,
 JSImportData JSImportData,
 MarshallingGeneratorFactoryKey<(TargetFramework TargetFramework, Version TargetFrameworkVersion, JSGeneratorOptions)> GeneratorFactoryKey,
 SequenceEqualImmutableArray<Diagnostic> Diagnostics);
 SequenceEqualImmutableArray<DiagnosticInfo> Diagnostics);

 public static class StepNames
 {
Expand DownExpand Up@@ -69,13 +69,13 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 if (data.Right.IsEmpty // no attributed methods
 || data.Left.Compilation.Options is CSharpCompilationOptions { AllowUnsafe: true }) // Unsafe code enabled
 {
 return ImmutableArray<Diagnostic>.Empty;
 return ImmutableArray<DiagnosticInfo>.Empty;
 }

 return ImmutableArray.Create(Diagnostic.Create(GeneratorDiagnostics.JSImportRequiresAllowUnsafeBlocks, null));
 return ImmutableArray.Create(DiagnosticInfo.Create(GeneratorDiagnostics.JSImportRequiresAllowUnsafeBlocks, null));
 }));

 IncrementalValuesProvider<(MemberDeclarationSyntax, ImmutableArray<Diagnostic>)> generateSingleStub = methodsToGenerate
 IncrementalValuesProvider<(MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>)> generateSingleStub = methodsToGenerate
 .Combine(stubEnvironment)
 .Combine(stubOptions)
 .Select(static (data, ct) => new
Expand DownExpand Up@@ -201,7 +201,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
 new MethodSignatureDiagnosticLocations(originalSyntax),
 jsImportData,
 CreateGeneratorFactory(environment, options),
 new SequenceEqualImmutableArray<Diagnostic>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 new SequenceEqualImmutableArray<DiagnosticInfo>(generatorDiagnostics.Diagnostics.ToImmutableArray()));
 }

 private static MarshallingGeneratorFactoryKey<(TargetFramework, Version, JSGeneratorOptions)> CreateGeneratorFactory(StubEnvironment env, JSGeneratorOptions options)
Expand All@@ -211,7 +211,7 @@ private static IncrementalStubGenerationContext CalculateStubInformation(
 return MarshallingGeneratorFactoryKey.Create((env.TargetFramework, env.TargetFrameworkVersion, options), jsGeneratorFactory);
 }

 private static (MemberDeclarationSyntax, ImmutableArray<Diagnostic>) GenerateSource(
 private static (MemberDeclarationSyntax, ImmutableArray<DiagnosticInfo>) GenerateSource(
 IncrementalStubGenerationContext incrementalContext)
 {
 var diagnostics = new GeneratorDiagnostics();
Expand Down

2 changes: 1 addition & 1 deletion
...ropServices/gen/ComInterfaceGenerator/Analyzers/GeneratedComInterfaceAttributeAnalyzer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ public override void Initialize(AnalysisContext context)
 && GetAttribute(typeSymbol, TypeNames.InterfaceTypeAttribute, out AttributeData? comInterfaceAttribute)
 && !InterfaceTypeAttributeIsSupported(comInterfaceAttribute, out string unsupportedValue))
 {
 context.ReportDiagnostic(comInterfaceAttribute.CreateDiagnostic(AnalyzerDiagnostics.InterfaceTypeNotSupported, unsupportedValue));
 context.ReportDiagnostic(comInterfaceAttribute.CreateDiagnosticInfo(AnalyzerDiagnostics.InterfaceTypeNotSupported, unsupportedValue).ToDiagnostic());
 }
 }, SymbolKind.NamedType);
 }
Expand Down

4 changes: 2 additions & 2 deletions
...libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComInterfaceContext.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,9 +57,9 @@ DiagnosticOr<ComInterfaceContext> AddContext(ComInterfaceInfo iface)
 {
 // The base has failed generation at some point, so this interface cannot be generated
 var diagnostic = DiagnosticOr<ComInterfaceContext>.From(
Diagnostic.Create(
DiagnosticInfo.Create(
 GeneratorDiagnostics.BaseInterfaceIsNotGenerated,
 iface.DiagnosticLocation.AsLocation(), iface.ThisInterfaceKey, iface.BaseInterfaceKey));
 iface.DiagnosticLocation, iface.ThisInterfaceKey, iface.BaseInterfaceKey));
 nameToContextCache[iface.ThisInterfaceKey] = diagnostic;
 return diagnostic;
 }
Expand Down
Loading