Reducing number of shared files

distantcam · distantcam · commit 6349f0c1a144 · 2025-12-25T17:59:44.000+08:00
diff --git a/src/AutoCtor.Roslyn3.11/GlobalSuppressions.cs b/src/AutoCtor.Roslyn3.11/GlobalSuppressions.cs
@@ -6,4 +6,3 @@
     Justification = "Old generator still maintained",
     Scope = "namespaceanddescendants",
     Target = "~N:AutoCtor")]
-
diff --git a/src/Shared/AutoConstructSourceGenerator/Diagnostics.cs b/src/Shared/AutoConstructSourceGenerator/Diagnostics.cs
@@ -1,21 +1,9 @@
 ﻿using Microsoft.CodeAnalysis;
 
-#if ROSLYN_3
-using EmitterContext = Microsoft.CodeAnalysis.GeneratorExecutionContext;
-#elif ROSLYN_4
-using EmitterContext = Microsoft.CodeAnalysis.SourceProductionContext;
-#endif
-
 namespace AutoCtor;
 
 internal static class Diagnostics
 {
-    public static void ReportDiagnostic(EmitterContext context, IHaveDiagnostics item, DiagnosticDescriptor diagnostic)
-    {
-        foreach (var loc in item.Locations)
-            context.ReportDiagnostic(Diagnostic.Create(diagnostic, loc, item.ErrorName));
-    }
-
     /// <summary>
     /// Id: ACTR001<br />
     /// Title: Ambiguous marked post constructor method
diff --git a/src/Shared/AutoConstructSourceGenerator/Emitter.cs b/src/Shared/AutoConstructSourceGenerator/Emitter.cs
@@ -208,7 +208,7 @@ private static ITypeSymbol SetGenerics(
             {
                 foreach (var m in markedPostCtorMethods)
                 {
-                    ReportDiagnostic(context, m, ACTR001_AmbiguousMarkedPostConstructMethod);
+                    context.ReportDiagnostic(m, ACTR001_AmbiguousMarkedPostConstructMethod);
                 }
                 return null;
             }
@@ -221,14 +221,14 @@ private static ITypeSymbol SetGenerics(
             // ACTR002
             if (!method.ReturnsVoid)
             {
-                ReportDiagnostic(context, method, ACTR002_PostConstructMethodNotVoid);
+                context.ReportDiagnostic(method, ACTR002_PostConstructMethodNotVoid);
                 return null;
             }
 
             // ACTR004
             if (method.IsGenericMethod)
             {
-                ReportDiagnostic(context, method, ACTR004_PostConstructMethodCannotBeGeneric);
+                context.ReportDiagnostic(method, ACTR004_PostConstructMethodCannotBeGeneric);
                 return null;
             }
 
@@ -237,7 +237,7 @@ private static ITypeSymbol SetGenerics(
                 // ACTR005
                 if (parameter.IsOutOrRef && parameter.KeyedService != null)
                 {
-                    ReportDiagnostic(context, parameter, ACTR005_PostConstructOutParameterCannotBeKeyed);
+                    context.ReportDiagnostic(parameter, ACTR005_PostConstructOutParameterCannotBeKeyed);
                     return null;
                 }
             }
diff --git a/src/Shared/Helpers/CodeBuilder.Templates.cs b/src/Shared/Helpers/CodeBuilder.Templates.cs
@@ -44,21 +44,9 @@ public CodeBuilder AddGeneratedAttributes(AttributeTargets attributeTargets)
         switch (attributeTargets)
         {
             case AttributeTargets.Class:
-                AddDebuggerNonUserCodeAttribute();
-                AddExcludeFromCodeCoverage();
-                break;
             case AttributeTargets.Struct:
-                AddDebuggerNonUserCodeAttribute();
-                AddExcludeFromCodeCoverage();
-                break;
             case AttributeTargets.Constructor:
-                AddDebuggerNonUserCodeAttribute();
-                AddExcludeFromCodeCoverage();
-                break;
             case AttributeTargets.Method:
-                AddDebuggerNonUserCodeAttribute();
-                AddExcludeFromCodeCoverage();
-                break;
             case AttributeTargets.Property:
                 AddDebuggerNonUserCodeAttribute();
                 AddExcludeFromCodeCoverage();
diff --git a/src/Shared/Helpers/Extensions.cs b/src/Shared/Helpers/Extensions.cs
@@ -1,4 +1,13 @@
-﻿internal static class Extensions
+﻿using System.Diagnostics.CodeAnalysis;
+using Microsoft.CodeAnalysis;
+
+#if ROSLYN_3
+using EmitterContext = Microsoft.CodeAnalysis.GeneratorExecutionContext;
+#elif ROSLYN_4
+using EmitterContext = Microsoft.CodeAnalysis.SourceProductionContext;
+#endif
+
+internal static class Extensions
 {
     public static T? OnlyOrDefault<T>(this IEnumerable<T> source)
     {
@@ -47,4 +56,14 @@ public static bool MoreThan<T>(this IEnumerable<T> source, int limit)
         }
         return false;
     }
+
+    [SuppressMessage(
+        "MicrosoftCodeAnalysisCorrectness",
+        "RS1035:Do not use APIs banned for analyzers",
+        Justification = "Old generator still maintained")]
+    public static void ReportDiagnostic(this EmitterContext context, IHaveDiagnostics item, DiagnosticDescriptor diagnostic)
+    {
+        foreach (var loc in item.Locations)
+            context.ReportDiagnostic(Diagnostic.Create(diagnostic, loc, item.ErrorName));
+    }
 }
diff --git a/src/Shared/Helpers/IHaveDiagnostics.cs b/src/Shared/Helpers/IHaveDiagnostics.cs
diff --git a/src/Shared/Models/ParameterList.cs b/src/Shared/Models/ParameterList.cs
@@ -67,7 +67,7 @@ public ParameterList Build(EmitterContext context)
                 // ACTR006
                 if (matchingField.KeyedService != null)
                 {
-                    Diagnostics.ReportDiagnostic(context, matchingField,
+                    context.ReportDiagnostic(matchingField,
                         Diagnostics.ACTR006_PostConstructOutParameterMustNotMatchKeyedField);
                 }
 
diff --git a/src/Tests/ExampleTests.cs b/src/Tests/ExampleTests.cs
@@ -95,15 +95,8 @@ public class CompilationBuilderFactory : CompilationBuilderFactoryBase<AutoConst
         protected override IEnumerable<string> GetNuGetIds() => ["Microsoft.Extensions.DependencyInjection.Abstractions"];
     }
 
-    private static IEnumerable<string> GetExamplesFiles(string path)
-        => Directory.GetFiles(Path.Combine(TestFileHelper.BaseDir?.FullName ?? "", path), "*.cs")
-        .Where(e => !e.Contains(".g."));
-
     public static IEnumerable<Func<CodeFileTheoryData>> GetExamples()
     {
-        if (TestFileHelper.BaseDir is null)
-            throw new Exception("BaseDir is null");
-
         foreach (var example in GetExamplesFiles("Examples"))
         {
             yield return () => new CodeFileTheoryData(example) with
diff --git a/src/Tests/GeneratedAttributeTests.cs b/src/Tests/GeneratedAttributeTests.cs
@@ -26,7 +26,7 @@ await Verify(driver)
     public async Task AttributeCompilesProperly(CompilationBuilderFactory builderFactory)
     {
         var builder = builderFactory.Builder
-            .WithPreprocessorSymbols(["AUTOCTOR_EMBED_ATTRIBUTES"]);
+            .WithPreprocessorSymbols("AUTOCTOR_EMBED_ATTRIBUTES");
         var compilation = builder.Build(nameof(GeneratedAttributeTests));
         var driver = new GeneratorDriverBuilder()
             .AddGenerator(new AttributeSourceGenerator())
@@ -51,8 +51,8 @@ await Assert.That(outputCompilationDiagnostics).IsEmpty()
     public async Task PreserveAttributesTest(CompilationBuilderFactory builderFactory)
     {
         var builder = builderFactory.Builder
-            .AddCode("[AutoCtor.AutoConstruct] public partial class Test { }")
-            .WithPreprocessorSymbols(["AUTOCTOR_EMBED_ATTRIBUTES", "AUTOCTOR_USAGES"]);
+            .AddCodes("[AutoCtor.AutoConstruct] public partial class Test { }")
+            .WithPreprocessorSymbols("AUTOCTOR_EMBED_ATTRIBUTES", "AUTOCTOR_USAGES");
         var compilation = builder.Build(nameof(GeneratedAttributeTests));
 
         var driver = new GeneratorDriverBuilder()
@@ -80,7 +80,7 @@ public async Task EnsureGeneratedAttributesAreNotExternallyVisible(CompilationBu
     {
         // Issue 312
         var compileBuilder = builderFactory.Builder
-            .WithPreprocessorSymbols(["AUTOCTOR_EMBED_ATTRIBUTES"]);
+            .WithPreprocessorSymbols("AUTOCTOR_EMBED_ATTRIBUTES");
 
         var genDriver = new GeneratorDriverBuilder()
             .AddGenerator(new AttributeSourceGenerator())
diff --git a/src/Tests/Issue73.cs b/src/Tests/Issue73.cs
@@ -72,12 +72,12 @@ public sealed partial class TheClass : BaseClass<object, int, string>{}
 }
 ";
         var projectA = common
-            .AddCode(projectACode)
+            .AddCodes(projectACode)
             .Build("ProjectA");
 
         var projectB = common
             .AddCompilationReference(projectA)
-            .AddCode(projectBCode)
+            .AddCodes(projectBCode)
             .Build("ProjectB");
 
         return projectB;
diff --git a/src/Tests/Utilities/CompilationBuilder.cs b/src/Tests/Utilities/CompilationBuilder.cs
@@ -1,15 +1,27 @@
 ﻿using System.Collections.Immutable;
+using System.Xml.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Testing;
 
 public class CompilationBuilder
 {
+    private static readonly XDocument s_packageVersionDoc;
+    static CompilationBuilder()
+    {
+        var srcDir = new DirectoryInfo(Environment.CurrentDirectory)?.Parent?.Parent?.Parent;
+        var packageVersionsFile = Path.Combine(srcDir?.FullName ?? "", "Directory.Packages.props");
+        s_packageVersionDoc = XDocument.Load(packageVersionsFile);
+    }
+
     private ImmutableArray<MetadataReference> _references;
     private ImmutableArray<string> _codes;
 
     private CSharpParseOptions _parseOptions;
     private CSharpCompilationOptions _compilationOptions;
 
+    private string _targetFramework = "net10.0";
+
     public CSharpParseOptions ParseOptions => _parseOptions;
 
     public CompilationBuilder()
@@ -62,19 +74,37 @@ public CompilationBuilder AddCompilationReference(Compilation compilation)
         };
     }
 
-    public CompilationBuilder AddCode(string code)
+    public CompilationBuilder AddCodes(params IEnumerable<string> codes)
     {
         return new(this)
         {
-            _codes = _codes.Add(code)
+            _codes = _codes.AddRange(codes)
         };
     }
 
-    public CompilationBuilder AddCodes(IEnumerable<string> codes)
+    public async Task<CompilationBuilder> AddNugetReference(string id, string path = "lib", CancellationToken cancellationToken = default)
     {
+        var versionXml = s_packageVersionDoc.Root?.Descendants("PackageVersion")
+            .FirstOrDefault(el => el.Attribute("Include")?.Value == id);
+        var version = versionXml?.Attribute("Version")?.Value
+            ?? throw new Exception($"{id} missing from Directory.Packages.props");
+        var nugetReference = new ReferenceAssemblies(
+            _targetFramework,
+            new(id, version),
+            Path.Combine(path, _targetFramework));
+        var references = await nugetReference.ResolveAsync(_parseOptions.Language, cancellationToken)
+            .ConfigureAwait(false);
         return new(this)
         {
-            _codes = _codes.AddRange(codes)
+            _references = _references.AddRange(references)
+        };
+    }
+
+    public CompilationBuilder WithTargetFramework(string targetFramework)
+    {
+        return new(this)
+        {
+            _targetFramework = targetFramework
         };
     }
 
@@ -86,7 +116,7 @@ public CompilationBuilder WithNullableContextOptions(NullableContextOptions opti
         };
     }
 
-    public CompilationBuilder WithPreprocessorSymbols(IEnumerable<string>? preprocessorSymbols)
+    public CompilationBuilder WithPreprocessorSymbols(params IEnumerable<string>? preprocessorSymbols)
     {
         return new(this)
         {
diff --git a/src/Tests/Utilities/ExampleTestsHelper.cs b/src/Tests/Utilities/ExampleTestsHelper.cs
@@ -1,7 +1,6 @@
 ﻿using System.Collections.Immutable;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.Testing;
 using TUnit.Core.Interfaces;
 
 public static class ExampleTestsHelper
@@ -24,6 +23,17 @@ public static class ExampleTestsHelper
 #endif
     ];
 
+    private static DirectoryInfo? BaseDir { get; } = new DirectoryInfo(Environment.CurrentDirectory)?.Parent?.Parent;
+
+    public static IEnumerable<string> GetExamplesFiles(string path)
+    {
+        var examplesPath = Path.Combine(BaseDir?.FullName ?? "", path);
+        if (!Directory.Exists(examplesPath))
+            return [];
+        return Directory.GetFiles(examplesPath, "*.cs")
+        .Where(e => !e.Contains(".g."));
+    }
+
     public abstract class CompilationBuilderFactoryBase<TAttribute> : CompilationBuilderFactoryBase
     {
         public override async Task InitializeAsync()
@@ -35,19 +45,20 @@ public override async Task InitializeAsync()
 
     public abstract class CompilationBuilderFactoryBase : IAsyncInitializer
     {
-        private const string DEFAULT_TARGET_FRAMEWORK = "net10.0";
-
         public CompilationBuilder Builder { get; protected set; } = null!;
 
         public virtual async Task InitializeAsync()
         {
             Builder = new CompilationBuilder()
                 .WithNullableContextOptions(NullableContextOptions.Enable)
                 .WithPreprocessorSymbols(PreprocessorSymbols);
-            Builder = await AddNugetReference(Builder, "Microsoft.NETCore.App.Ref", "ref");
+
+            Builder = await Builder.AddNugetReference("Microsoft.NETCore.App.Ref", "ref")
+                .ConfigureAwait(false);
             foreach (var id in GetNuGetIds())
             {
-                Builder = await AddNugetReference(Builder, id);
+                Builder = await Builder.AddNugetReference(id)
+                    .ConfigureAwait(false);
             }
         }
 
@@ -62,18 +73,6 @@ public CompilationBuilder Create(CodeFileTheoryData theoryData)
             }
             return builder;
         }
-
-        private static async Task<CompilationBuilder> AddNugetReference(CompilationBuilder builder, string id, string path = "", CancellationToken cancellationToken = default)
-        {
-            var version = TestFileHelper.GetPackageVersion(id);
-            var nugetReference = new ReferenceAssemblies(
-                DEFAULT_TARGET_FRAMEWORK,
-                new(id, version),
-                Path.Join(string.IsNullOrEmpty(path) ? "lib" : path, DEFAULT_TARGET_FRAMEWORK));
-            var references = await nugetReference.ResolveAsync(null, cancellationToken)
-                .ConfigureAwait(false);
-            return builder.AddReferences(references);
-        }
     }
 
 #if ROSLYN_4
diff --git a/src/Tests/Utilities/Shim.cs b/src/Tests/Utilities/Shim.cs
diff --git a/src/Tests/Utilities/TestFileHelper.cs b/src/Tests/Utilities/TestFileHelper.cs
diff --git a/src/Tests/Utilities/TestHelper.cs b/src/Tests/Utilities/TestHelper.cs
@@ -1,11 +1,14 @@
 ﻿using System.Runtime.CompilerServices;
+using Microsoft.CodeAnalysis;
 using TUnit.Assertions.Core;
 
 public static class TestHelper
 {
     public static CancellationToken CancellationToken =>
         TestContext.Current?.Execution?.CancellationToken ?? CancellationToken.None;
 
+    public static ISourceGenerator AsSourceGenerator(this ISourceGenerator generator) => generator;
+
     public static ConfiguredTaskAwaitable<TValue?> ConfigureAwait<TValue>(this Assertion<TValue> assertion, bool continueOnCapturedContext)
     {
         return assertion.AssertAsync().ConfigureAwait(continueOnCapturedContext);

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ private static ITypeSymbol SetGenerics(`
`208`	`208`	`{`
`209`	`209`	`foreach (var m in markedPostCtorMethods)`
`210`	`210`	`{`
`211`		`- ReportDiagnostic(context, m, ACTR001_AmbiguousMarkedPostConstructMethod);`
	`211`	`+ context.ReportDiagnostic(m, ACTR001_AmbiguousMarkedPostConstructMethod);`
`212`	`212`	`}`
`213`	`213`	`return null;`
`214`	`214`	`}`
`@@ -221,14 +221,14 @@ private static ITypeSymbol SetGenerics(`
`221`	`221`	`// ACTR002`
`222`	`222`	`if (!method.ReturnsVoid)`
`223`	`223`	`{`
`224`		`- ReportDiagnostic(context, method, ACTR002_PostConstructMethodNotVoid);`
	`224`	`+ context.ReportDiagnostic(method, ACTR002_PostConstructMethodNotVoid);`
`225`	`225`	`return null;`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`// ACTR004`
`229`	`229`	`if (method.IsGenericMethod)`
`230`	`230`	`{`
`231`		`- ReportDiagnostic(context, method, ACTR004_PostConstructMethodCannotBeGeneric);`
	`231`	`+ context.ReportDiagnostic(method, ACTR004_PostConstructMethodCannotBeGeneric);`
`232`	`232`	`return null;`
`233`	`233`	`}`
`234`	`234`
`@@ -237,7 +237,7 @@ private static ITypeSymbol SetGenerics(`
`237`	`237`	`// ACTR005`
`238`	`238`	`if (parameter.IsOutOrRef && parameter.KeyedService != null)`
`239`	`239`	`{`
`240`		`- ReportDiagnostic(context, parameter, ACTR005_PostConstructOutParameterCannotBeKeyed);`
	`240`	`+ context.ReportDiagnostic(parameter, ACTR005_PostConstructOutParameterCannotBeKeyed);`
`241`	`241`	`return null;`
`242`	`242`	`}`
`243`	`243`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,13 @@`
`1`		`-internal static class Extensions`
	`1`	`+using System.Diagnostics.CodeAnalysis;`
	`2`	`+using Microsoft.CodeAnalysis;`
	`3`	`+`
	`4`	`+#if ROSLYN_3`
	`5`	`+using EmitterContext = Microsoft.CodeAnalysis.GeneratorExecutionContext;`
	`6`	`+#elif ROSLYN_4`
	`7`	`+using EmitterContext = Microsoft.CodeAnalysis.SourceProductionContext;`
	`8`	`+#endif`
	`9`	`+`
	`10`	`+internal static class Extensions`
`2`	`11`	`{`
`3`	`12`	`public static T? OnlyOrDefault<T>(this IEnumerable<T> source)`
`4`	`13`	`{`
`@@ -47,4 +56,14 @@ public static bool MoreThan<T>(this IEnumerable<T> source, int limit)`
`47`	`56`	`}`
`48`	`57`	`return false;`
`49`	`58`	`}`
	`59`	`+`
	`60`	`+ [SuppressMessage(`
	`61`	`+ "MicrosoftCodeAnalysisCorrectness",`
	`62`	`+ "RS1035:Do not use APIs banned for analyzers",`
	`63`	`+ Justification = "Old generator still maintained")]`
	`64`	`+ public static void ReportDiagnostic(this EmitterContext context, IHaveDiagnostics item, DiagnosticDescriptor diagnostic)`
	`65`	`+ {`
	`66`	`+ foreach (var loc in item.Locations)`
	`67`	`+ context.ReportDiagnostic(Diagnostic.Create(diagnostic, loc, item.ErrorName));`
	`68`	`+ }`
`50`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public ParameterList Build(EmitterContext context)`
`67`	`67`	`// ACTR006`
`68`	`68`	`if (matchingField.KeyedService != null)`
`69`	`69`	`{`
`70`		`- Diagnostics.ReportDiagnostic(context, matchingField,`
	`70`	`+ context.ReportDiagnostic(matchingField,`
`71`	`71`	`Diagnostics.ACTR006_PostConstructOutParameterMustNotMatchKeyedField);`
`72`	`72`	`}`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -95,15 +95,8 @@ public class CompilationBuilderFactory : CompilationBuilderFactoryBase<AutoConst`
`95`	`95`	`protected override IEnumerable<string> GetNuGetIds() => ["Microsoft.Extensions.DependencyInjection.Abstractions"];`
`96`	`96`	`}`
`97`	`97`
`98`		`- private static IEnumerable<string> GetExamplesFiles(string path)`
`99`		`- => Directory.GetFiles(Path.Combine(TestFileHelper.BaseDir?.FullName ?? "", path), "*.cs")`
`100`		`- .Where(e => !e.Contains(".g."));`
`101`		`-`
`102`	`98`	`public static IEnumerable<Func<CodeFileTheoryData>> GetExamples()`
`103`	`99`	`{`
`104`		`- if (TestFileHelper.BaseDir is null)`
`105`		`- throw new Exception("BaseDir is null");`
`106`		`-`
`107`	`100`	`foreach (var example in GetExamplesFiles("Examples"))`
`108`	`101`	`{`
`109`	`102`	`yield return () => new CodeFileTheoryData(example) with`