Skip to content

Commit 9795b8c

Browse files
ufcppufcpp
authored
Merge pull request #14 from ufcpp/roslyn_4_0_0
Roslyn 4 0 0
2 parents 28f4a00 + b4bd0f5 commit 9795b8c

9 files changed

Lines changed: 61 additions & 77 deletions

‎samples/StringLiteralCodeAnalysisSample/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ private static Compilation Compile(string source)
9393
options: copt);
9494

9595
// apply the source generator
96-
var driver = CSharpGeneratorDriver.Create(new[] { new Utf8StringLiteralGenerator() }, parseOptions: opt);
96+
var driver = CSharpGeneratorDriver.Create(new Utf8StringLiteralGenerator());
9797
driver.RunGeneratorsAndUpdateCompilation(compilation, out var resultCompilation, out _);
9898

9999
return resultCompilation;

‎samples/StringLiteralCodeAnalysisSample/StringLiteralCodeAnalysisSample.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net5.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" PrivateAssets="all" />
9+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-4.final" PrivateAssets="all" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎src/StringLiteralGenerator/ReservedAttributes.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
namespace System.Runtime.CompilerServices;
2+
3+
internal class IsExternalInit { }

‎src/StringLiteralGenerator/StringLiteralGenerator.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
@@ -19,7 +19,7 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.9.0" PrivateAssets="all" />
22+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.0-4.final" PrivateAssets="all" />
2323
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" PrivateAssets="all" />
2424
</ItemGroup>
2525

‎src/StringLiteralGenerator/TypeInfo.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ namespace StringLiteralGenerator;
44

55
public partial class Utf8StringLiteralGenerator
66
{
7+
private record Utf8LiteralMethod(TypeInfo Type, MethodInfo Method)
8+
{
9+
public Utf8LiteralMethod(IMethodSymbol m, string text)
10+
: this(new TypeInfo(m.ContainingType), new MethodInfo(m, text))
11+
{ }
12+
}
13+
714
private record struct TypeInfo(string? Namespace, string Name)
815
{
916
public TypeInfo(INamedTypeSymbol t)
@@ -24,3 +31,4 @@ public MethodInfo(IMethodSymbol m, string text)
2431
{ }
2532
}
2633
}
34+

‎src/StringLiteralGenerator/Utf8StringLiteralGenerator.Emitter.cs‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,30 @@
11
using Microsoft.CodeAnalysis;
2+
using Microsoft.CodeAnalysis.Text;
23
using System;
34
using System.Collections.Generic;
5+
using System.Collections.Immutable;
6+
using System.Linq;
47
using System.Text;
58

69
namespace StringLiteralGenerator;
710

8-
public partial class Utf8StringLiteralGenerator : ISourceGenerator
11+
public partial class Utf8StringLiteralGenerator
912
{
13+
private static void Emit(SourceProductionContext context, ImmutableArray<Utf8LiteralMethod> methods)
14+
{
15+
var buffer = new StringBuilder();
16+
17+
var group = methods.GroupBy(x => x.Type, x => x.Method);
18+
19+
foreach (var g in group)
20+
{
21+
var containingType = g.Key;
22+
var generatedSource = Generate(containingType, g, buffer);
23+
var filename = GetFilename(containingType, buffer);
24+
context.AddSource(filename, SourceText.From(generatedSource, Encoding.UTF8));
25+
}
26+
}
27+
1028
private static string GetFilename(TypeInfo type, StringBuilder buffer)
1129
{
1230
buffer.Clear();

‎src/StringLiteralGenerator/Utf8StringLiteralGenerator.Init.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace StringLiteralGenerator;
66

7-
public partial class Utf8StringLiteralGenerator : ISourceGenerator
7+
public partial class Utf8StringLiteralGenerator
88
{
99
private const string attributeText = @"// <auto-generated />
1010
using System;
@@ -19,7 +19,7 @@ public Utf8Attribute(string s) { }
1919
}
2020
";
2121

22-
private static void AddAttribute(GeneratorPostInitializationContext context)
22+
private static void AddAttribute(IncrementalGeneratorPostInitializationContext context)
2323
{
2424
context.AddSource("Utf8Attribute", SourceText.From(attributeText, Encoding.UTF8));
2525
}

‎src/StringLiteralGenerator/Utf8StringLiteralGenerator.Parser.cs‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
using Microsoft.CodeAnalysis;
2+
using Microsoft.CodeAnalysis.CSharp;
23
using Microsoft.CodeAnalysis.CSharp.Syntax;
34

45
namespace StringLiteralGenerator;
56

6-
public partial class Utf8StringLiteralGenerator : ISourceGenerator
7+
public partial class Utf8StringLiteralGenerator
78
{
89
private const string attributeName = "StringLiteral.Utf8Attribute";
910

10-
private static bool IsStaticPartial(MemberDeclarationSyntax m)
11+
private static bool IsSyntaxTargetForGeneration(SyntaxNode node) =>
12+
node is MethodDeclarationSyntax { AttributeLists.Count: > 0 };
13+
14+
private static Utf8LiteralMethod? GetSemanticTargetForGeneration(SemanticModel semanticModel, MethodDeclarationSyntax m)
1115
{
12-
bool isStatic = false;
13-
bool isPartial = false;
14-
foreach (var mod in m.Modifiers)
15-
{
16-
isStatic |= mod.Text == "static";
17-
isPartial |= mod.Text == "partial";
18-
}
19-
return isStatic && isPartial;
16+
if (m.ParameterList.Parameters.Count != 0) return null;
17+
if (semanticModel.GetDeclaredSymbol(m) is not { } methodSymbol) return null;
18+
if (!methodSymbol.IsPartialDefinition || !methodSymbol.IsStatic) return null;
19+
if (!ReturnsString(methodSymbol)) return null;
20+
if (GetUtf8Attribute(methodSymbol) is not { } value) return null;
21+
22+
return new(methodSymbol, value);
2023
}
2124

2225
static bool ReturnsString(IMethodSymbol methodSymbol)

‎src/StringLiteralGenerator/Utf8StringLiteralGenerator.cs‎

Lines changed: 11 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,23 @@
11
using Microsoft.CodeAnalysis;
2-
using Microsoft.CodeAnalysis.CSharp;
32
using Microsoft.CodeAnalysis.CSharp.Syntax;
4-
using Microsoft.CodeAnalysis.Text;
5-
using System.Collections.Generic;
6-
using System.Linq;
7-
using System.Text;
83

94
namespace StringLiteralGenerator;
105

116
[Generator]
12-
public partial class Utf8StringLiteralGenerator : ISourceGenerator
7+
public partial class Utf8StringLiteralGenerator : IIncrementalGenerator
138
{
14-
public void Execute(GeneratorExecutionContext context)
9+
public void Initialize(IncrementalGeneratorInitializationContext context)
1510
{
16-
if (context.SyntaxReceiver is not SyntaxReceiver receiver) return;
11+
context.RegisterPostInitializationOutput(AddAttribute);
1712

18-
var compilation = context.Compilation;
13+
var provider = context.SyntaxProvider
14+
.CreateSyntaxProvider(
15+
static (node, _) => IsSyntaxTargetForGeneration(node),
16+
static (context, _) => GetSemanticTargetForGeneration(context.SemanticModel, (MethodDeclarationSyntax)context.Node)!
17+
)
18+
.Where(x => x is not null)
19+
.Collect();
1920

20-
var buffer = new StringBuilder();
21-
22-
var group = enumerate().GroupBy(x => x.type, x => x.method);
23-
24-
foreach (var g in group)
25-
{
26-
var containingType = g.Key;
27-
var generatedSource = Generate(containingType, g, buffer);
28-
var filename = GetFilename(containingType, buffer);
29-
context.AddSource(filename, SourceText.From(generatedSource, Encoding.UTF8));
30-
}
31-
32-
IEnumerable<(TypeInfo type, MethodInfo method)> enumerate()
33-
{
34-
foreach (var m in receiver.CandidateMethods)
35-
{
36-
if (!IsStaticPartial(m)) continue;
37-
38-
var model = compilation.GetSemanticModel(m.SyntaxTree);
39-
40-
if (m.ParameterList.Parameters.Count != 0) continue;
41-
if (model.GetDeclaredSymbol(m) is not { } methodSymbol) continue;
42-
if (!ReturnsString(methodSymbol)) continue;
43-
if (GetUtf8Attribute(methodSymbol) is not { } value) continue;
44-
45-
46-
yield return (new(methodSymbol.ContainingType), new(methodSymbol, value));
47-
}
48-
}
49-
}
50-
51-
public void Initialize(GeneratorInitializationContext context)
52-
{
53-
context.RegisterForPostInitialization(AddAttribute);
54-
context.RegisterForSyntaxNotifications(() => new SyntaxReceiver());
55-
}
56-
57-
class SyntaxReceiver : ISyntaxReceiver
58-
{
59-
public List<MethodDeclarationSyntax> CandidateMethods { get; } = new List<MethodDeclarationSyntax>();
60-
61-
public void OnVisitSyntaxNode(SyntaxNode syntaxNode)
62-
{
63-
// any field with at least one attribute is a candidate for property generation
64-
if (syntaxNode is MethodDeclarationSyntax methodDeclarationSyntax
65-
&& methodDeclarationSyntax.AttributeLists.Count > 0)
66-
{
67-
CandidateMethods.Add(methodDeclarationSyntax);
68-
}
69-
}
21+
context.RegisterImplementationSourceOutput(provider, Emit);
7022
}
7123
}

0 commit comments

Comments
 (0)