Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix error when a source code contains alias-qualified attribute names #727

Merged
merged 1 commit into from
Dec 22, 2023
Merged

Fix error when a source code contains alias-qualified attribute names #727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/MagicOnion.Client.SourceGenerator.Unity/MagicOnionClientSourceGenerator.Roslyn3.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,11 @@ public void OnVisitSyntaxNode(GeneratorSyntaxContext context)
attrSyntax.Parent is AttributeListSyntax &&
attrSyntax.Parent.Parent is ClassDeclarationSyntax classDeclSyntax)
{
var attrName = attrSyntax.Name is QualifiedNameSyntax qualifiedName
var attrName = attrSyntax.Name is QualifiedNameSyntax qualifiedName /* Foo.Bar.AttrName */
? qualifiedName.Right.Identifier.ValueText
: ((IdentifierNameSyntax)attrSyntax.Name).Identifier.ValueText;
: attrSyntax.Name is AliasQualifiedNameSyntax aliasQualifiedName /* foo::AttrName */
? aliasQualifiedName.Name.Identifier.ValueText
: ((IdentifierNameSyntax)attrSyntax.Name).Identifier.ValueText; /* AttrName */

if (attrName.StartsWith(MagicOnionClientSourceGenerator.MagicOnionClientGenerationAttributeShortName, StringComparison.Ordinal))
{
Expand Down
48 changes: 48 additions & 0 deletions tests/MagicOnion.Client.SourceGenerator.Tests/RunTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,4 +187,52 @@ partial class MagicOnionInitializer {}
// var allOutputReason = result.TrackedOutputSteps.SelectMany(x => x.Value).SelectMany(x => x.Outputs);
// Assert.Collection(allOutputReason, x => Assert.Equal(IncrementalStepRunReason.Unchanged, x.Reason));
//}

[Fact]
public void RunAndGenerate_ParseAttributeName()
{
var (compilation, semanticModel) = CompilationHelper.Create(
"""
using MagicOnion.Client;

using moc = global::MagicOnion.Client;

[MagicOnionClientGeneration]
partial class IdentifierOnly {}

[MagicOnion.Client.MagicOnionClientGeneration]
partial class FullyQualified {}

[global::MagicOnion.Client.MagicOnionClientGeneration]
partial class FullyQualifiedWithGlobal {}

[moc::MagicOnionClientGeneration]
partial class AliasQualified {}


[MagicOnionClientGenerationAttribute]
partial class FullName_IdentifierOnly {}

[MagicOnion.Client.MagicOnionClientGenerationAttribute]
partial class FullName_FullyQualified {}

[global::MagicOnion.Client.MagicOnionClientGenerationAttribute]
partial class FullName_FullyQualifiedWithGlobal {}

[moc::MagicOnionClientGenerationAttribute]
partial class FullName_AliasQualified {}
""");
var sourceGenerator = new MagicOnionClientSourceGenerator();

GeneratorDriver driver = CSharpGeneratorDriver.Create(
generators: new[] { sourceGenerator.AsSourceGenerator() },
driverOptions: new GeneratorDriverOptions(IncrementalGeneratorOutputKind.None, trackIncrementalGeneratorSteps: true)
);

// Run generator and update compilation
driver = driver.RunGeneratorsAndUpdateCompilation(compilation, out var newCompilation, out var diagnostics);

Assert.DoesNotContain(diagnostics, x => x.Severity > DiagnosticSeverity.Info);
Assert.DoesNotContain(newCompilation.GetDiagnostics(), x => x.Severity > DiagnosticSeverity.Info);
}
}
Loading