Merge pull request #14 from ufcpp/roslyn_4_0_0

Roslyn 4 0 0

Author: ufcpp

samples/StringLiteralCodeAnalysisSample/Program.cs

@@ -93,7 +93,7 @@ private static Compilation Compile(string source)
             options: copt);
 
         // apply the source generator
-        var driver = CSharpGeneratorDriver.Create(new[] { new Utf8StringLiteralGenerator() }, parseOptions: opt);
+        var driver = CSharpGeneratorDriver.Create(new Utf8StringLiteralGenerator());
         driver.RunGeneratorsAndUpdateCompilation(compilation, out var resultCompilation, out _);
 
         return resultCompilation;

samples/StringLiteralCodeAnalysisSample/StringLiteralCodeAnalysisSample.csproj

@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-4.final" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

src/StringLiteralGenerator/ReservedAttributes.cs

@@ -0,0 +1,3 @@
+namespace System.Runtime.CompilerServices;
+
+internal class IsExternalInit { }

src/StringLiteralGenerator/StringLiteralGenerator.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.9.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.0-4.final" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" PrivateAssets="all" />
   </ItemGroup>
 

src/StringLiteralGenerator/TypeInfo.cs

@@ -4,6 +4,13 @@ namespace StringLiteralGenerator;
 
 public partial class Utf8StringLiteralGenerator
 {
+    private record Utf8LiteralMethod(TypeInfo Type, MethodInfo Method)
+    {
+        public Utf8LiteralMethod(IMethodSymbol m, string text)
+            : this(new TypeInfo(m.ContainingType), new MethodInfo(m, text))
+        { }
+    }
+
     private record struct TypeInfo(string? Namespace, string Name)
     {
         public TypeInfo(INamedTypeSymbol t)
@@ -24,3 +31,4 @@ public MethodInfo(IMethodSymbol m, string text)
         { }
     }
 }
+

src/StringLiteralGenerator/Utf8StringLiteralGenerator.Emitter.cs

@@ -1,12 +1,30 @@
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
 using System.Text;
 
 namespace StringLiteralGenerator;
 
-public partial class Utf8StringLiteralGenerator : ISourceGenerator
+public partial class Utf8StringLiteralGenerator
 {
+    private static void Emit(SourceProductionContext context, ImmutableArray<Utf8LiteralMethod> methods)
+    {
+        var buffer = new StringBuilder();
+
+        var group = methods.GroupBy(x => x.Type, x => x.Method);
+
+        foreach (var g in group)
+        {
+            var containingType = g.Key;
+            var generatedSource = Generate(containingType, g, buffer);
+            var filename = GetFilename(containingType, buffer);
+            context.AddSource(filename, SourceText.From(generatedSource, Encoding.UTF8));
+        }
+    }
+
     private static string GetFilename(TypeInfo type, StringBuilder buffer)
     {
         buffer.Clear();

src/StringLiteralGenerator/Utf8StringLiteralGenerator.Init.cs

@@ -4,7 +4,7 @@
 
 namespace StringLiteralGenerator;
 
-public partial class Utf8StringLiteralGenerator : ISourceGenerator
+public partial class Utf8StringLiteralGenerator
 {
     private const string attributeText = @"// <auto-generated />
 using System;
@@ -19,7 +19,7 @@ public Utf8Attribute(string s) { }
 }
 ";
 
-    private static void AddAttribute(GeneratorPostInitializationContext context)
+    private static void AddAttribute(IncrementalGeneratorPostInitializationContext context)
     {
         context.AddSource("Utf8Attribute", SourceText.From(attributeText, Encoding.UTF8));
     }

src/StringLiteralGenerator/Utf8StringLiteralGenerator.Parser.cs

@@ -1,22 +1,25 @@
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace StringLiteralGenerator;
 
-public partial class Utf8StringLiteralGenerator : ISourceGenerator
+public partial class Utf8StringLiteralGenerator
 {
     private const string attributeName = "StringLiteral.Utf8Attribute";
 
-    private static bool IsStaticPartial(MemberDeclarationSyntax m)
+    private static bool IsSyntaxTargetForGeneration(SyntaxNode node) =>
+        node is MethodDeclarationSyntax { AttributeLists.Count: > 0 };
+
+    private static Utf8LiteralMethod? GetSemanticTargetForGeneration(SemanticModel semanticModel, MethodDeclarationSyntax m)
     {
-        bool isStatic = false;
-        bool isPartial = false;
-        foreach (var mod in m.Modifiers)
-        {
-            isStatic |= mod.Text == "static";
-            isPartial |= mod.Text == "partial";
-        }
-        return isStatic && isPartial;
+        if (m.ParameterList.Parameters.Count != 0) return null;
+        if (semanticModel.GetDeclaredSymbol(m) is not { } methodSymbol) return null;
+        if (!methodSymbol.IsPartialDefinition || !methodSymbol.IsStatic) return null;
+        if (!ReturnsString(methodSymbol)) return null;
+        if (GetUtf8Attribute(methodSymbol) is not { } value) return null;
+
+        return new(methodSymbol, value);
     }
 
     static bool ReturnsString(IMethodSymbol methodSymbol)

src/StringLiteralGenerator/Utf8StringLiteralGenerator.cs

@@ -1,71 +1,23 @@
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Text;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace StringLiteralGenerator;
 
 [Generator]
-public partial class Utf8StringLiteralGenerator : ISourceGenerator
+public partial class Utf8StringLiteralGenerator : IIncrementalGenerator
 {
-    public void Execute(GeneratorExecutionContext context)
+    public void Initialize(IncrementalGeneratorInitializationContext context)
     {
-        if (context.SyntaxReceiver is not SyntaxReceiver receiver) return;
+        context.RegisterPostInitializationOutput(AddAttribute);
 
-        var compilation = context.Compilation;
+        var provider = context.SyntaxProvider
+            .CreateSyntaxProvider(
+                static (node, _) => IsSyntaxTargetForGeneration(node),
+                static (context, _) => GetSemanticTargetForGeneration(context.SemanticModel, (MethodDeclarationSyntax)context.Node)!
+                )
+            .Where(x => x is not null)
+            .Collect();
 
-        var buffer = new StringBuilder();
-
-        var group = enumerate().GroupBy(x => x.type, x => x.method);
-
-        foreach (var g in group)
-        {
-            var containingType = g.Key;
-            var generatedSource = Generate(containingType, g, buffer);
-            var filename = GetFilename(containingType, buffer);
-            context.AddSource(filename, SourceText.From(generatedSource, Encoding.UTF8));
-        }
-
-        IEnumerable<(TypeInfo type, MethodInfo method)> enumerate()
-        {
-            foreach (var m in receiver.CandidateMethods)
-            {
-                if (!IsStaticPartial(m)) continue;
-
-                var model = compilation.GetSemanticModel(m.SyntaxTree);
-
-                if (m.ParameterList.Parameters.Count != 0) continue;
-                if (model.GetDeclaredSymbol(m) is not { } methodSymbol) continue;
-                if (!ReturnsString(methodSymbol)) continue;
-                if (GetUtf8Attribute(methodSymbol) is not { } value) continue;
-
-
-                yield return (new(methodSymbol.ContainingType), new(methodSymbol, value));
-            }
-        }
-    }
-
-    public void Initialize(GeneratorInitializationContext context)
-    {
-        context.RegisterForPostInitialization(AddAttribute);
-        context.RegisterForSyntaxNotifications(() => new SyntaxReceiver());
-    }
-
-    class SyntaxReceiver : ISyntaxReceiver
-    {
-        public List<MethodDeclarationSyntax> CandidateMethods { get; } = new List<MethodDeclarationSyntax>();
-
-        public void OnVisitSyntaxNode(SyntaxNode syntaxNode)
-        {
-            // any field with at least one attribute is a candidate for property generation
-            if (syntaxNode is MethodDeclarationSyntax methodDeclarationSyntax
-                && methodDeclarationSyntax.AttributeLists.Count > 0)
-            {
-                CandidateMethods.Add(methodDeclarationSyntax);
-            }
-        }
+        context.RegisterImplementationSourceOutput(provider, Emit);
     }
 }