Turning on more analyzers in code

distantcam · distantcam · commit e942c8f71a2d · 2025-12-30T16:51:52.000+08:00
diff --git a/.editorconfig b/.editorconfig
@@ -232,6 +232,12 @@ dotnet_style_require_accessibility_modifiers = for_non_interface_members:warning
 # Use file scoped namespaces
 csharp_style_namespace_declarations = file_scoped:warning
 
+# CA1019: Define accessors for attribute arguments
+dotnet_diagnostic.CA1019.severity = none
+
+# IDE0305: Simplify collection initialization
+dotnet_diagnostic.IDE0305.severity = none
+
 # Verify settings
 [*.{received,verified}.{cs,txt}]
 charset = "utf-8-bom"
diff --git a/src/AutoCtor.Roslyn3.11/AutoConstructSourceGenerator.cs b/src/AutoCtor.Roslyn3.11/AutoConstructSourceGenerator.cs
@@ -56,7 +56,7 @@ public void Execute(GeneratorExecutionContext context)
         }
 
         var models = (
-            receiver.TypeModels?.ToImmutableArray() ?? ImmutableArray<TypeModel>.Empty,
+            receiver.TypeModels.ToImmutableArray(),
             receiver.MarkedMethods?.ToImmutableArray() ?? ImmutableArray<PostCtorModel>.Empty
         );
         Emitter.GenerateSource(context, (models, enableGuards));
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,15 +1,21 @@
 <Project>
 
   <PropertyGroup>
-    <LangVersion>latest</LangVersion>
-    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <LangVersion>latest</LangVersion>
     <UseArtifactsOutput>true</UseArtifactsOutput>
     <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <AnalysisLevel>latest</AnalysisLevel>
+    <AnalysisMode>all</AnalysisMode>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+  </PropertyGroup>
+
   <ItemGroup>
     <Using Include="System" />
     <Using Include="System.Collections.Generic" />
diff --git a/src/Shared/AutoConstructSourceGenerator/Emitter.cs b/src/Shared/AutoConstructSourceGenerator/Emitter.cs
@@ -69,7 +69,7 @@ public static void GenerateSource(
 
                 var postCtorMethods = input.Models.PostCtorMethods
                     .Where(m => m.TypeKey == type.TypeKey)
-                    .ToList();
+                    .ToImmutableArray();
 
                 var (source, parameters) = GenerateSource(context, type, postCtorMethods, baseParameters, input.Guards);
 
@@ -85,7 +85,7 @@ public static void GenerateSource(
         private static (SourceText?, ParameterList?) GenerateSource(
             EmitterContext context,
             TypeModel type,
-            IEnumerable<PostCtorModel> markedPostCtorMethods,
+            ImmutableArray<PostCtorModel> markedPostCtorMethods,
             IEnumerable<ParameterModel>? baseParameters,
             bool guards)
         {
@@ -201,10 +201,10 @@ private static ITypeSymbol SetGenerics(
 
         private static PostCtorModel? GetPostCtorMethod(
             EmitterContext context,
-            IEnumerable<PostCtorModel> markedPostCtorMethods)
+            ImmutableArray<PostCtorModel> markedPostCtorMethods)
         {
             // ACTR001
-            if (markedPostCtorMethods.MoreThan(1))
+            if (markedPostCtorMethods.Length > 1)
             {
                 foreach (var m in markedPostCtorMethods)
                 {
@@ -213,10 +213,10 @@ private static ITypeSymbol SetGenerics(
                 return null;
             }
 
-            if (!markedPostCtorMethods.Any())
+            if (markedPostCtorMethods.Length != 1)
                 return null;
 
-            var method = markedPostCtorMethods.First();
+            var method = markedPostCtorMethods[0];
 
             // ACTR002
             if (!method.ReturnsVoid)
diff --git a/src/Shared/AutoConstructSourceGenerator/Tracking.cs b/src/Shared/AutoConstructSourceGenerator/Tracking.cs
@@ -1,7 +1,10 @@
-namespace AutoCtor;
+﻿namespace AutoCtor;
 
 public partial class AutoConstructSourceGenerator
 {
+    [System.Diagnostics.CodeAnalysis.SuppressMessage(
+        "Design", "CA1034:Nested types should not be visible",
+        Justification = "Constants used in tests.")]
     public static class TrackingNames
     {
         public static string BuildProperties => nameof(BuildProperties);
diff --git a/src/Shared/Helpers/CodeBuilder.InterpolatedStringHandler.cs b/src/Shared/Helpers/CodeBuilder.InterpolatedStringHandler.cs
@@ -32,13 +32,13 @@ public CodeBuilder AppendLine(bool enabled,
     private void AppendFormatted(IEnumerable<string> items, string? format)
     {
         if (format == "comma")
-            AppendCommaSeparated(items);
+            AppendCommaSeparated(items.ToList());
 
-        if (format == "commaindent")
-            AppendCommaIndented(items);
+        else if (format == "commaindent")
+            AppendCommaIndented(items.ToList());
     }
 
-    private void AppendCommaSeparated(IEnumerable<string> items)
+    private void AppendCommaSeparated(List<string> items)
     {
         var comma = false;
         foreach (var item in items)
@@ -50,7 +50,7 @@ private void AppendCommaSeparated(IEnumerable<string> items)
         }
     }
 
-    private void AppendCommaIndented(IEnumerable<string> items)
+    private void AppendCommaIndented(List<string> items)
     {
         var length = items.Sum(s => s.Length);
         if (length < 60)
@@ -87,7 +87,7 @@ public readonly bool AppendFormatted(IEnumerable<string> items, string? format)
     }
 
     [InterpolatedStringHandler]
-    internal class IndentedCodeBuilderInterpolatedStringHandler(
+    internal sealed class IndentedCodeBuilderInterpolatedStringHandler(
         int literalLength, int formattedCount, CodeBuilder codeBuilder, bool enabled = true)
     {
         private bool _hasIndented;
diff --git a/src/Shared/Helpers/CodeBuilder.Templates.cs b/src/Shared/Helpers/CodeBuilder.Templates.cs
@@ -1,18 +1,24 @@
 ﻿using System.Reflection;
 
-internal partial class CodeBuilder
+internal sealed partial class CodeBuilder
 {
     private static readonly string s_assemblyName;
     private static readonly string s_version;
     private static readonly string? s_packageProjectUrl;
     private static readonly string? s_gitSha;
 
+    [System.Diagnostics.CodeAnalysis.SuppressMessage(
+        "Performance", "CA1810:Initialize reference type static fields inline",
+        Justification = "No static members or inheritance.")]
     static CodeBuilder()
     {
-        var assembly = Assembly.GetAssembly(typeof(CodeBuilder));
-        s_assemblyName = assembly?.GetCustomAttribute<AssemblyTitleAttribute>()?.Title ?? "Untitled";
-        s_version = assembly?.GetCustomAttribute<AssemblyFileVersionAttribute>()?.Version ?? "0.0.0.0";
-        var metadata = assembly?.GetCustomAttributes<AssemblyMetadataAttribute>()?.ToDictionary(m => m.Key, m => m.Value);
+        var assembly = typeof(CodeBuilder).Assembly;
+        s_assemblyName = assembly?.GetCustomAttribute<AssemblyTitleAttribute>()?.Title
+            ?? "Untitled";
+        s_version = assembly?.GetCustomAttribute<AssemblyFileVersionAttribute>()?.Version
+            ?? "0.0.0.0";
+        var metadata = assembly?.GetCustomAttributes<AssemblyMetadataAttribute>()?
+            .ToDictionary(m => m.Key, m => m.Value);
         if (metadata != null)
         {
             metadata.TryGetValue("PackageProjectUrl", out s_packageProjectUrl);
diff --git a/src/Shared/Helpers/CodeBuilder.cs b/src/Shared/Helpers/CodeBuilder.cs
@@ -4,7 +4,7 @@
 internal partial class CodeBuilder
 {
     private readonly StringBuilder _stringBuilder = new();
-    private int _indent = 0;
+    private int _indent;
 
     public char IndentChar { get; set; } = '\t';
     public string Indent => new(IndentChar, _indent);
diff --git a/src/Shared/Helpers/Extensions.cs b/src/Shared/Helpers/Extensions.cs
@@ -42,21 +42,6 @@ internal static class Extensions
         return default;
     }
 
-    public static bool MoreThan<T>(this IEnumerable<T> source, int limit)
-    {
-        if (source is ICollection<T> collection)
-            return collection.Count > limit;
-        var count = 0;
-        using var e = source.GetEnumerator();
-        while (e.MoveNext())
-        {
-            count++;
-            if (count > limit)
-                return true;
-        }
-        return false;
-    }
-
     [SuppressMessage(
         "MicrosoftCodeAnalysisCorrectness",
         "RS1035:Do not use APIs banned for analyzers",
diff --git a/src/Shared/Models/MemberModel.cs b/src/Shared/Models/MemberModel.cs
@@ -23,7 +23,7 @@ public static MemberModel Create(IFieldSymbol field)
         if (i > 0 && !char.IsLetter(field.Name[i]))
             i--;
         var friendlyName = char.IsUpper(field.Name[i])
-            ? char.ToLower(field.Name[i]) + field.Name.Substring(i + 1)
+            ? char.ToLowerInvariant(field.Name[i]) + field.Name.Substring(i + 1)
             : field.Name.Substring(i);
         friendlyName = friendlyName.EscapeKeywordIdentifier();
 
@@ -43,7 +43,7 @@ public static MemberModel Create(IFieldSymbol field)
 
     public static MemberModel Create(IPropertySymbol property)
     {
-        var friendlyName = new string([char.ToLower(property.Name[0]), .. property.Name.Substring(1)]).EscapeKeywordIdentifier();
+        var friendlyName = new string([char.ToLowerInvariant(property.Name[0]), .. property.Name.Substring(1)]).EscapeKeywordIdentifier();
 
         return new MemberModel(
             Type: new(property.Type),
diff --git a/src/Shared/Models/ParameterList.cs b/src/Shared/Models/ParameterList.cs
@@ -8,7 +8,7 @@
 using EmitterContext = Microsoft.CodeAnalysis.SourceProductionContext;
 #endif
 
-internal class ParameterListBuilder(IEnumerable<MemberModel> fields, IEnumerable<MemberModel> properties)
+internal sealed class ParameterListBuilder(IEnumerable<MemberModel> fields, IEnumerable<MemberModel> properties)
 {
     private IEnumerable<ParameterModel> _baseParameters = [];
     private IEnumerable<ParameterModel> _postCtorParameters = [];
@@ -107,7 +107,7 @@ private static string ConstructorParameterCSharp(KeyValuePair<ParameterModel, st
         return $"{u.Key.Type} {u.Value}{defaultValue}";
     }
 
-    private bool GetUniqueName(ParameterModel p, HashSet<string> nameHash, Dictionary<ParameterModel, string> uniqueNames, out string name)
+    private static bool GetUniqueName(ParameterModel p, HashSet<string> nameHash, Dictionary<ParameterModel, string> uniqueNames, out string name)
     {
         if (uniqueNames.TryGetValue(p, out name))
             return true;
@@ -124,7 +124,7 @@ private bool GetUniqueName(ParameterModel p, HashSet<string> nameHash, Dictionar
     }
 }
 
-internal class ParameterList(
+internal sealed class ParameterList(
     IEnumerable<string> ctorParameterDeclarations,
     IEnumerable<string> baseParameters,
     IEnumerable<string> postCtorParameters,
diff --git a/src/Tests/ExampleTests.cs b/src/Tests/ExampleTests.cs
@@ -6,7 +6,7 @@
 using Microsoft.CodeAnalysis.CSharp;
 #endif
 
-public class ExampleTests
+internal sealed class ExampleTests
 {
     [Test]
     [CombinedDataSources]
@@ -90,7 +90,10 @@ await AssertRunsEqual(firstResult, secondResult,
 
     // ----------------------------------------------------------------------------------------
 
-    public class CompilationBuilderFactory : CompilationBuilderFactoryBase<AutoConstructAttribute>
+    [System.Diagnostics.CodeAnalysis.SuppressMessage(
+        "Performance", "CA1812:Avoid uninstantiated internal classes",
+        Justification = "Instantiated in generated code.")]
+    internal sealed class CompilationBuilderFactory : CompilationBuilderFactoryBase<AutoConstructAttribute>
     {
         protected override IEnumerable<string> GetNuGetIds() => ["Microsoft.Extensions.DependencyInjection.Abstractions"];
     }
diff --git a/src/Tests/GeneratedAttributeTests.cs b/src/Tests/GeneratedAttributeTests.cs
@@ -1,7 +1,7 @@
 ﻿using AutoCtor;
 using static ExampleTestsHelper;
 
-public class GeneratedAttributeTests
+internal sealed class GeneratedAttributeTests
 {
     [Test]
     [ClassDataSource<CompilationBuilderFactory>(Shared = SharedType.PerTestSession)]
@@ -109,5 +109,8 @@ await Assert.That(outputCompilationDiagnostics).IsEmpty()
             .ConfigureAwait(false);
     }
 
-    public class CompilationBuilderFactory : CompilationBuilderFactoryBase;
+    [System.Diagnostics.CodeAnalysis.SuppressMessage(
+        "Performance", "CA1812:Avoid uninstantiated internal classes",
+        Justification = "Instantiated in generated code.")]
+    internal sealed class CompilationBuilderFactory : CompilationBuilderFactoryBase;
 }
diff --git a/src/Tests/Issue73.cs b/src/Tests/Issue73.cs
@@ -3,7 +3,7 @@
 using Microsoft.CodeAnalysis.CSharp;
 using static ExampleTestsHelper;
 
-public class Issue73
+internal sealed class Issue73
 {
     [Test]
     [ClassDataSource<CompilationBuilderFactory>(Shared = SharedType.PerTestSession)]
@@ -83,5 +83,8 @@ public sealed partial class TheClass : BaseClass<object, int, string>{}
         return projectB;
     }
 
-    public class CompilationBuilderFactory : CompilationBuilderFactoryBase<AutoConstructAttribute>;
+    [System.Diagnostics.CodeAnalysis.SuppressMessage(
+        "Performance", "CA1812:Avoid uninstantiated internal classes",
+        Justification = "Instantiated in generated code.")]
+    internal sealed class CompilationBuilderFactory : CompilationBuilderFactoryBase<AutoConstructAttribute>;
 }
diff --git a/src/Tests/Utilities/CodeFileTheoryData.cs b/src/Tests/Utilities/CodeFileTheoryData.cs
@@ -1,6 +1,6 @@
 ﻿using System.Diagnostics.CodeAnalysis;
 
-public record CodeFileTheoryData
+internal sealed record CodeFileTheoryData
 {
     public required string Name { get; set; }
     public required string[] Codes { get; set; }
diff --git a/src/Tests/Utilities/CompilationBuilder.cs b/src/Tests/Utilities/CompilationBuilder.cs
@@ -4,12 +4,16 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Testing;
 
-public class CompilationBuilder
+internal sealed class CompilationBuilder
 {
     private static readonly XDocument s_packageVersionDoc;
+
+    [System.Diagnostics.CodeAnalysis.SuppressMessage(
+        "Performance", "CA1810:Initialize reference type static fields inline",
+        Justification = "No static members or inheritance.")]
     static CompilationBuilder()
     {
-        var srcDir = new DirectoryInfo(Environment.CurrentDirectory)?.Parent?.Parent?.Parent;
+        var srcDir = new DirectoryInfo(Environment.CurrentDirectory).Parent?.Parent?.Parent;
         var packageVersionsFile = Path.Combine(srcDir?.FullName ?? "", "Directory.Packages.props");
         s_packageVersionDoc = XDocument.Load(packageVersionsFile);
     }
@@ -87,7 +91,7 @@ public async Task<CompilationBuilder> AddNugetReference(string id, string path =
         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");
+            ?? throw new InvalidOperationException($"{id} missing from Directory.Packages.props");
         var nugetReference = new ReferenceAssemblies(
             _targetFramework,
             new(id, version),
diff --git a/src/Tests/Utilities/ExampleTestsHelper.cs b/src/Tests/Utilities/ExampleTestsHelper.cs
@@ -3,7 +3,7 @@
 using Microsoft.CodeAnalysis.CSharp;
 using TUnit.Core.Interfaces;
 
-public static class ExampleTestsHelper
+internal static class ExampleTestsHelper
 {
     public static readonly IEnumerable<string> PreprocessorSymbols = [
 #if ROSLYN_3
@@ -23,27 +23,27 @@ public static class ExampleTestsHelper
 #endif
     ];
 
-    private static DirectoryInfo? BaseDir { get; } = new DirectoryInfo(Environment.CurrentDirectory)?.Parent?.Parent;
+    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."));
+            .Where(e => !e.Contains(".g.", StringComparison.InvariantCulture));
     }
 
-    public abstract class CompilationBuilderFactoryBase<TAttribute> : CompilationBuilderFactoryBase
+    internal abstract class CompilationBuilderFactoryBase<TAttribute> : CompilationBuilderFactoryBase
     {
         public override async Task InitializeAsync()
         {
-            await base.InitializeAsync();
+            await base.InitializeAsync().ConfigureAwait(false);
             Builder = Builder.AddAssemblyReference<TAttribute>();
         }
     }
 
-    public abstract class CompilationBuilderFactoryBase : IAsyncInitializer
+    internal abstract class CompilationBuilderFactoryBase : IAsyncInitializer
     {
         public CompilationBuilder Builder { get; protected set; } = null!;
 
diff --git a/src/Tests/Utilities/GeneratorDriverBuilder.cs b/src/Tests/Utilities/GeneratorDriverBuilder.cs
diff --git a/src/Tests/Utilities/ModuleInitializer.cs b/src/Tests/Utilities/ModuleInitializer.cs
diff --git a/src/Tests/Utilities/TestHelper.cs b/src/Tests/Utilities/TestHelper.cs
diff --git a/src/Tests/VerifyChecksTests.cs b/src/Tests/VerifyChecksTests.cs

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public void Execute(GeneratorExecutionContext context)`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`var models = (`
`59`		`- receiver.TypeModels?.ToImmutableArray() ?? ImmutableArray<TypeModel>.Empty,`
	`59`	`+ receiver.TypeModels.ToImmutableArray(),`
`60`	`60`	`receiver.MarkedMethods?.ToImmutableArray() ?? ImmutableArray<PostCtorModel>.Empty`
`61`	`61`	`);`
`62`	`62`	`Emitter.GenerateSource(context, (models, enableGuards));`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,10 @@`
`1`		`-namespace AutoCtor;`
	`1`	`+namespace AutoCtor;`
`2`	`2`
`3`	`3`	`public partial class AutoConstructSourceGenerator`
`4`	`4`	`{`
	`5`	`+ [System.Diagnostics.CodeAnalysis.SuppressMessage(`
	`6`	`+ "Design", "CA1034:Nested types should not be visible",`
	`7`	`+ Justification = "Constants used in tests.")]`
`5`	`8`	`public static class TrackingNames`
`6`	`9`	`{`
`7`	`10`	`public static string BuildProperties => nameof(BuildProperties);`
Original file line number	Diff line number	Diff line change
`@@ -32,13 +32,13 @@ public CodeBuilder AppendLine(bool enabled,`
`32`	`32`	`private void AppendFormatted(IEnumerable<string> items, string? format)`
`33`	`33`	`{`
`34`	`34`	`if (format == "comma")`
`35`		`- AppendCommaSeparated(items);`
	`35`	`+ AppendCommaSeparated(items.ToList());`
`36`	`36`
`37`		`- if (format == "commaindent")`
`38`		`- AppendCommaIndented(items);`
	`37`	`+ else if (format == "commaindent")`
	`38`	`+ AppendCommaIndented(items.ToList());`
`39`	`39`	`}`
`40`	`40`
`41`		`- private void AppendCommaSeparated(IEnumerable<string> items)`
	`41`	`+ private void AppendCommaSeparated(List<string> items)`
`42`	`42`	`{`
`43`	`43`	`var comma = false;`
`44`	`44`	`foreach (var item in items)`
`@@ -50,7 +50,7 @@ private void AppendCommaSeparated(IEnumerable<string> items)`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`53`		`- private void AppendCommaIndented(IEnumerable<string> items)`
	`53`	`+ private void AppendCommaIndented(List<string> items)`
`54`	`54`	`{`
`55`	`55`	`var length = items.Sum(s => s.Length);`
`56`	`56`	`if (length < 60)`
`@@ -87,7 +87,7 @@ public readonly bool AppendFormatted(IEnumerable<string> items, string? format)`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`[InterpolatedStringHandler]`
`90`		`- internal class IndentedCodeBuilderInterpolatedStringHandler(`
	`90`	`+ internal sealed class IndentedCodeBuilderInterpolatedStringHandler(`
`91`	`91`	`int literalLength, int formattedCount, CodeBuilder codeBuilder, bool enabled = true)`
`92`	`92`	`{`
`93`	`93`	`private bool _hasIndented;`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`internal partial class CodeBuilder`
`5`	`5`	`{`
`6`	`6`	`private readonly StringBuilder _stringBuilder = new();`
`7`		`- private int _indent = 0;`
	`7`	`+ private int _indent;`
`8`	`8`
`9`	`9`	`public char IndentChar { get; set; } = '\t';`
`10`	`10`	`public string Indent => new(IndentChar, _indent);`