-
-
Notifications
You must be signed in to change notification settings - Fork 127
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #587 from Sergio0694/dev/generated-marshaller-attr…
…ibute Add [D2DGeneratedPixelShaderDescriptor] attribute and use FAWMN
- Loading branch information
Showing
75 changed files
with
1,080 additions
and
124 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
src/ComputeSharp.D2D1.CodeFixers/ComputeSharp.D2D1.CodeFixers.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <TargetFramework>netstandard2.0</TargetFramework> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.6.0" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\ComputeSharp.D2D1.SourceGenerators\ComputeSharp.D2D1.SourceGenerators.csproj" /> | ||
| </ItemGroup> | ||
| </Project> |
208 changes: 208 additions & 0 deletions
208
src/ComputeSharp.D2D1.CodeFixers/MissingPixelShaderDescriptorOnPixelShaderCodeFixer.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,208 @@ | ||
| using System.Collections.Immutable; | ||
| using System.Composition; | ||
| using System.Threading; | ||
| using System.Threading.Tasks; | ||
| using ComputeSharp.SourceGeneration.Extensions; | ||
| using Microsoft.CodeAnalysis; | ||
| using Microsoft.CodeAnalysis.CodeActions; | ||
| using Microsoft.CodeAnalysis.CodeFixes; | ||
| using Microsoft.CodeAnalysis.CSharp.Syntax; | ||
| using Microsoft.CodeAnalysis.Editing; | ||
| using Microsoft.CodeAnalysis.Simplification; | ||
| using Microsoft.CodeAnalysis.Text; | ||
| using static ComputeSharp.SourceGeneration.Diagnostics.DiagnosticDescriptors; | ||
|
|
||
| namespace ComputeSharp.D2D1.CodeFixers; | ||
|
|
||
| /// <summary> | ||
| /// A code fixer that adds the <c>[D2DGeneratedPixelShaderDescriptor]</c> to D2D1 shader types with no descriptor. | ||
| /// </summary> | ||
| [ExportCodeFixProvider(LanguageNames.CSharp)] | ||
| [Shared] | ||
| public sealed class MissingPixelShaderDescriptorOnPixelShaderCodeFixer : CodeFixProvider | ||
| { | ||
| /// <summary> | ||
| /// The set of type names for all D2D attributes that can be over shader types. | ||
| /// </summary> | ||
| private static readonly ImmutableArray<string> D2DAttributeTypeNames = ImmutableArray.Create( | ||
| "ComputeSharp.D2D1.D2DCompileOptionsAttribute", | ||
| "ComputeSharp.D2D1.D2DEffectAuthorAttribute", | ||
| "ComputeSharp.D2D1.D2DEffectCategoryAttribute", | ||
| "ComputeSharp.D2D1.D2DEffectDescriptionAttribute", | ||
| "ComputeSharp.D2D1.D2DEffectDisplayNameAttribute", | ||
| "ComputeSharp.D2D1.D2DEffectIdAttribute", | ||
| "ComputeSharp.D2D1.D2DInputComplexAttribute", | ||
| "ComputeSharp.D2D1.D2DInputCountAttribute", | ||
| "ComputeSharp.D2D1.D2DInputDescriptionAttribute", | ||
| "ComputeSharp.D2D1.D2DInputSimpleAttribute", | ||
| "ComputeSharp.D2D1.D2DOutputBufferAttribute", | ||
| "ComputeSharp.D2D1.D2DPixelOptionsAttribute", | ||
| "ComputeSharp.D2D1.D2DRequiresScenePositionAttribute", | ||
| "ComputeSharp.D2D1.D2DShaderProfileAttribute"); | ||
|
|
||
| /// <inheritdoc/> | ||
| public override ImmutableArray<string> FixableDiagnosticIds { get; } = ImmutableArray.Create(MissingPixelShaderDescriptorOnPixelShaderTypeId); | ||
|
|
||
| /// <inheritdoc/> | ||
| public override Microsoft.CodeAnalysis.CodeFixes.FixAllProvider? GetFixAllProvider() | ||
| { | ||
| return new FixAllProvider(); | ||
| } | ||
|
|
||
| /// <inheritdoc/> | ||
| public override async Task RegisterCodeFixesAsync(CodeFixContext context) | ||
| { | ||
| Diagnostic diagnostic = context.Diagnostics[0]; | ||
| TextSpan diagnosticSpan = context.Span; | ||
|
|
||
| SyntaxNode? root = await context.Document.GetSyntaxRootAsync(context.CancellationToken).ConfigureAwait(false); | ||
|
|
||
| // Get the struct declaration from the target diagnostic | ||
| if (root?.FindNode(diagnosticSpan) is StructDeclarationSyntax structDeclaration) | ||
| { | ||
| // Register the code fix to update the return type to be Task instead | ||
| context.RegisterCodeFix( | ||
| CodeAction.Create( | ||
| title: "Add [D2DGeneratedPixelShaderDescriptor] attribute", | ||
| createChangedDocument: token => AddMissingD2DGeneratedPixelShaderDescriptorAttribute(context.Document, root, structDeclaration, token), | ||
| equivalenceKey: "Add [D2DGeneratedPixelShaderDescriptor] attribute"), | ||
| diagnostic); | ||
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Applies the code fix to add the [D2DGeneratedPixelShaderDescriptor] attribute to a target type. | ||
| /// </summary> | ||
| /// <param name="document">The original document being fixed.</param> | ||
| /// <param name="root">The original tree root belonging to the current document.</param> | ||
| /// <param name="structDeclaration">The <see cref="StructDeclarationSyntax"/> to update.</param> | ||
| /// <param name="cancellationToken">The cancellation token for the operation.</param> | ||
| /// <returns>An updated document with the applied code fix, and the return type of the method being <see cref="Task"/>.</returns> | ||
| private static async Task<Document> AddMissingD2DGeneratedPixelShaderDescriptorAttribute( | ||
| Document document, | ||
| SyntaxNode root, | ||
| StructDeclarationSyntax structDeclaration, | ||
| CancellationToken cancellationToken) | ||
| { | ||
| // Get the new struct declaration | ||
| SyntaxNode updatedStructDeclaration = await AddMissingD2DGeneratedPixelShaderDescriptorAttribute( | ||
| document, | ||
| structDeclaration, | ||
| cancellationToken); | ||
|
|
||
| // Replace the node in the document tree | ||
| return document.WithSyntaxRoot(root.ReplaceNode(structDeclaration, updatedStructDeclaration)); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Applies the code fix to add the [D2DGeneratedPixelShaderDescriptor] attribute to a target type. | ||
| /// </summary> | ||
| /// <param name="document">The original document being fixed.</param> | ||
| /// <param name="structDeclaration">The <see cref="StructDeclarationSyntax"/> to update.</param> | ||
| /// <param name="cancellationToken">The cancellation token for the operation.</param> | ||
| /// <returns>An updated document with the applied code fix, and the return type of the method being <see cref="Task"/>.</returns> | ||
| private static async Task<SyntaxNode> AddMissingD2DGeneratedPixelShaderDescriptorAttribute( | ||
| Document document, | ||
| StructDeclarationSyntax structDeclaration, | ||
| CancellationToken cancellationToken) | ||
| { | ||
| // Get the semantic model (bail if it's not available) | ||
| if (await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false) is not SemanticModel semanticModel) | ||
| { | ||
| return structDeclaration; | ||
| } | ||
|
|
||
| // Build the map of D2D attributes to look for | ||
| if (!semanticModel.Compilation.TryBuildNamedTypeSymbolSet(D2DAttributeTypeNames, out ImmutableHashSet<INamedTypeSymbol>? d2DAttributeTypeSymbols)) | ||
| { | ||
| return structDeclaration; | ||
| } | ||
|
|
||
| // Also bail if we can't resolve the [D2DGeneratedPixelShaderDescriptor] attribute symbol (this should really never happen) | ||
| if (semanticModel.Compilation.GetTypeByMetadataName("ComputeSharp.D2D1.D2DGeneratedPixelShaderDescriptorAttribute") is not INamedTypeSymbol attributeSymbol) | ||
| { | ||
| return structDeclaration; | ||
| } | ||
|
|
||
| int index = 0; | ||
|
|
||
| // Find the index to use to insert the attribute. We want to make it so that if the struct declaration | ||
| // has a bunch of D2D attributes, the new one will be inserted right after that. This way the final list | ||
| // will be nicely sorted, instead of having D2D attributes interleaving other unrelated attributes, if any. | ||
| foreach (AttributeListSyntax attributeList in structDeclaration.AttributeLists) | ||
| { | ||
| // Make sure we have an attribute to check | ||
| if (attributeList.Attributes is not [AttributeSyntax attribute, ..]) | ||
| { | ||
| continue; | ||
| } | ||
|
|
||
| // Resolve the symbol for the attribute (stop here if this failed for whatever reason) | ||
| if (!semanticModel.GetSymbolInfo(attribute, cancellationToken).TryGetAttributeTypeSymbol(out INamedTypeSymbol? attributeTypeSymbol)) | ||
| { | ||
| break; | ||
| } | ||
|
|
||
| // If the attribute is D2D one, increment the index and continue | ||
| if (d2DAttributeTypeSymbols.Contains(attributeTypeSymbol)) | ||
| { | ||
| index++; | ||
| } | ||
| else | ||
| { | ||
| // Otherwise, stop here, we reached the end of the sequence | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| SyntaxGenerator syntaxGenerator = SyntaxGenerator.GetGenerator(document); | ||
|
|
||
| // Create the attribute syntax for the new attribute. Also annotate it | ||
| // to automatically add using directives to the document, if needed. | ||
| // Then create the attribute syntax and insert it at the right position. | ||
| SyntaxNode attributeTypeSyntax = syntaxGenerator.TypeExpression(attributeSymbol).WithAdditionalAnnotations(Simplifier.AddImportsAnnotation); | ||
| SyntaxNode attributeSyntax = syntaxGenerator.Attribute(attributeTypeSyntax); | ||
| SyntaxNode updatedStructDeclarationSyntax = syntaxGenerator.InsertAttributes(structDeclaration, index, attributeSyntax); | ||
|
|
||
| // Replace the node in the syntax tree | ||
| return updatedStructDeclarationSyntax; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// A custom <see cref="FixAllProvider"/> with the logic from <see cref="MissingPixelShaderDescriptorOnPixelShaderCodeFixer"/>. | ||
| /// </summary> | ||
| private sealed class FixAllProvider : DocumentBasedFixAllProvider | ||
| { | ||
| /// <inheritdoc/> | ||
| protected override async Task<Document?> FixAllAsync(FixAllContext fixAllContext, Document document, ImmutableArray<Diagnostic> diagnostics) | ||
| { | ||
| // Get the document root (this should always succeed) | ||
| if (await document.GetSyntaxRootAsync(fixAllContext.CancellationToken).ConfigureAwait(false) is not SyntaxNode root) | ||
| { | ||
| return document; | ||
| } | ||
|
|
||
| SyntaxEditor syntaxEditor = new(root, fixAllContext.Solution.Services); | ||
|
|
||
| foreach (Diagnostic diagnostic in diagnostics) | ||
| { | ||
| // Get the current struct declaration for the diagnostic | ||
| if (root.FindNode(diagnostic.Location.SourceSpan) is not StructDeclarationSyntax structDeclaration) | ||
| { | ||
| continue; | ||
| } | ||
|
|
||
| // Get the syntax node with the updated declaration | ||
| SyntaxNode updatedStructDeclaration = await AddMissingD2DGeneratedPixelShaderDescriptorAttribute( | ||
| document, | ||
| structDeclaration, | ||
| fixAllContext.CancellationToken); | ||
|
|
||
| // Replace the node via the editor | ||
| syntaxEditor.ReplaceNode(structDeclaration, updatedStructDeclaration); | ||
| } | ||
|
|
||
| return document.WithSyntaxRoot(syntaxEditor.GetChangedRoot()); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.