fix and suppress warnings

smdn · smdn · commit 432e55bb4084 · 2025-07-09T03:54:06.000+09:00
diff --git a/src/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi/ApiListWriterOptions.cs b/src/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi/ApiListWriterOptions.cs
@@ -5,7 +5,9 @@ namespace Smdn.Reflection.ReverseGenerating.ListApi;
 public class ApiListWriterOptions : GeneratorOptions {
   public WriterOptions Writer { get; } = new();
 
+#pragma warning disable CA1034
   public class WriterOptions {
+#pragma warning restore CA1034
     public bool OrderStaticMembersFirst { get; set; } = false;
     public bool OmitCompilerGeneratedRecordEqualityMethods { get; set; } = false;
     public bool ThrowIfForwardedTypesCouldNotLoaded { get; set; } = false;
diff --git a/src/Smdn.Reflection.ReverseGenerating.ListApi/Smdn.Reflection.ReverseGenerating.ListApi.Build/ProjectBuilder.cs b/src/Smdn.Reflection.ReverseGenerating.ListApi/Smdn.Reflection.ReverseGenerating.ListApi.Build/ProjectBuilder.cs
@@ -18,9 +18,9 @@
 namespace Smdn.Reflection.ReverseGenerating.ListApi.Build;
 
 public static class ProjectBuilder {
-#pragma warning disable CA1724
+#pragma warning disable CA1034, CA1724
   public class Options {
-#pragma warning restore CA1724
+#pragma warning restore CA1034, CA1724
     public const string DefaultConfiguration = "Debug";
 
     public string? Configuration { get; init; } = DefaultConfiguration;
diff --git a/src/Smdn.Reflection.ReverseGenerating/Smdn.Reflection.ReverseGenerating/GeneratorOptions.cs b/src/Smdn.Reflection.ReverseGenerating/Smdn.Reflection.ReverseGenerating/GeneratorOptions.cs
@@ -29,7 +29,9 @@ public virtual GeneratorOptions Clone()
 
   public TypeDeclarationOptions TypeDeclaration { get; init; } = new();
 
+#pragma warning disable CA1034
   public class TypeDeclarationOptions {
+#pragma warning restore CA1034
     public bool WithNamespace { get; set; } = false;
     public bool WithDeclaringTypeName { get; set; } = false;
     public bool WithAccessibility { get; set; } = true;
@@ -48,7 +50,9 @@ internal TypeDeclarationOptions Clone()
 
   public MemberDeclarationOptions MemberDeclaration { get; init; } = new();
 
+#pragma warning disable CA1034
   public class MemberDeclarationOptions {
+#pragma warning restore CA1034
     public bool WithNamespace { get; set; } = false;
     public bool WithDeclaringTypeName { get; set; } = false;
     public bool WithEnumTypeName { get; set; } = false;
@@ -67,7 +71,9 @@ internal MemberDeclarationOptions Clone()
 
   public AttributeDeclarationOptions AttributeDeclaration { get; init; } = new();
 
+#pragma warning disable CA1034
   public class AttributeDeclarationOptions {
+#pragma warning restore CA1034
     public bool WithNamespace { get; set; } = false;
     public bool WithDeclaringTypeName { get; set; } = false;
     public bool WithNamedArguments { get; set; } = false;
@@ -87,7 +93,9 @@ internal AttributeDeclarationOptions Clone()
 
   public ValueDeclarationOptions ValueDeclaration { get; init; } = new();
 
+#pragma warning disable CA1034
   public class ValueDeclarationOptions {
+#pragma warning restore CA1034
     public bool UseDefaultLiteral { get; set; } = false;
     public bool WithNamespace { get; set; } = false;
     public bool WithDeclaringTypeName { get; set; } = true;
@@ -98,7 +106,9 @@ internal ValueDeclarationOptions Clone()
 
   public ParameterDeclarationOptions ParameterDeclaration { get; init; } = new();
 
+#pragma warning disable CA1034
   public class ParameterDeclarationOptions {
+#pragma warning restore CA1034
     public bool WithNamespace { get; set; } = false;
     public bool WithDeclaringTypeName { get; set; } = false;
 
diff --git a/tests/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi/ApiListWriter.Records.cs b/tests/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi/ApiListWriter.Records.cs
@@ -1,7 +1,5 @@
 // SPDX-FileCopyrightText: 2025 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
-#nullable enable
-
 using System;
 using System.IO;
 using System.Runtime.CompilerServices;
diff --git a/tests/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi/ApiListWriter.cs b/tests/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi/ApiListWriter.cs
@@ -1,7 +1,5 @@
 // SPDX-FileCopyrightText: 2023 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
-#nullable enable
-
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/tests/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi/AssemblyLoader.cs b/tests/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi/AssemblyLoader.cs
@@ -1,7 +1,5 @@
 // SPDX-FileCopyrightText: 2021 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
-#nullable enable
-
 using System;
 using System.Linq;
 using System.IO;
diff --git a/tests/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi/AttributeFilter.TestCases.NullableAttributes.cs b/tests/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi/AttributeFilter.TestCases.NullableAttributes.cs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 #pragma warning disable CS8597, CS8618
 
+#nullable disable warnings
 #nullable enable annotations
 
 using System;
diff --git a/tests/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi/AttributeFilter.TestCases.cs b/tests/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi/AttributeFilter.TestCases.cs
@@ -1,6 +1,8 @@
 // SPDX-FileCopyrightText: 2022 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
 // cSpell:ignore browsable
+#nullable disable
+
 #pragma warning disable CS8597
 
 using System;
diff --git a/tests/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi/AttributeFilter.cs b/tests/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi/AttributeFilter.cs
@@ -98,7 +98,7 @@ GeneratorTestCaseAttribute testCase
     => TestAttributeFilter(
       actual: () => string.Join(", ", Generator.GenerateAttributeList(t, null, testCase.CreateGeneratorOptions())),
       testCase: testCase,
-      testTarget: t.FullName
+      testTarget: t.FullName!
     );
 
   [TestCaseSource(nameof(YieldTestCases_Members))]
diff --git a/tests/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi/MemberInfoComparer.cs b/tests/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi/MemberInfoComparer.cs
@@ -11,16 +11,16 @@ namespace Smdn.Reflection.ReverseGenerating.ListApi;
 class MemberInfoComparerTests {
   class C {
 #pragma warning disable CS0067
-    static C() {}
+    static C() { }
     public static int SF = default;
     public static int SP { get; } = default;
-    public static event EventHandler SE;
+    public static event EventHandler? SE;
     public static void SM() => throw new NotImplementedException();
 
-    public C() {}
+    public C() { }
     public int F = default;
     public int P { get; } = default;
-    public event EventHandler E;
+    public event EventHandler? E;
     public void M() => throw new NotImplementedException();
 #pragma warning restore CS0067
   }
@@ -30,31 +30,31 @@ public void Compare_Default()
   {
     var t = typeof(C);
     var members = new MemberInfo[] {
-      t.TypeInitializer,
-      t.GetField("SF"),
-      t.GetProperty("SP"),
-      t.GetEvent("SE"),
-      t.GetMethod("SM"),
-      t.GetConstructor(BindingFlags.Public | BindingFlags.Instance, binder: null, Type.EmptyTypes, modifiers: null),
-      t.GetField("F"),
-      t.GetProperty("P"),
-      t.GetEvent("E"),
-      t.GetMethod("M"),
+      t.TypeInitializer!,
+      t.GetField("SF")!,
+      t.GetProperty("SP")!,
+      t.GetEvent("SE")!,
+      t.GetMethod("SM")!,
+      t.GetConstructor(BindingFlags.Public | BindingFlags.Instance, binder: null, Type.EmptyTypes, modifiers: null)!,
+      t.GetField("F")!,
+      t.GetProperty("P")!,
+      t.GetEvent("E")!,
+      t.GetMethod("M")!,
     };
 
     Assert.That(
       members.OrderBy(m => m, MemberInfoComparer.Default),
       Is.EqualTo(new MemberInfo[] {
-        t.GetEvent("SE"),
-        t.GetEvent("E"),
-        t.GetField("SF"),
-        t.GetField("F"),
-        t.TypeInitializer,
-        t.GetConstructor(BindingFlags.Public | BindingFlags.Instance, binder: null, Type.EmptyTypes, modifiers: null),
-        t.GetProperty("SP"),
-        t.GetProperty("P"),
-        t.GetMethod("SM"),
-        t.GetMethod("M"),
+        t.GetEvent("SE")!,
+        t.GetEvent("E")!,
+        t.GetField("SF")!,
+        t.GetField("F")!,
+        t.TypeInitializer!,
+        t.GetConstructor(BindingFlags.Public | BindingFlags.Instance, binder: null, Type.EmptyTypes, modifiers: null)!,
+        t.GetProperty("SP")!,
+        t.GetProperty("P")!,
+        t.GetMethod("SM")!,
+        t.GetMethod("M")!,
       }).AsCollection
     );
   }
@@ -64,31 +64,31 @@ public void Compare_StaticMembersFirst()
   {
     var t = typeof(C);
     var members = new MemberInfo[] {
-      t.TypeInitializer,
-      t.GetField("SF"),
-      t.GetProperty("SP"),
-      t.GetEvent("SE"),
-      t.GetMethod("SM"),
-      t.GetConstructor(BindingFlags.Public | BindingFlags.Instance, binder: null, Type.EmptyTypes, modifiers: null),
-      t.GetField("F"),
-      t.GetProperty("P"),
-      t.GetEvent("E"),
-      t.GetMethod("M"),
+      t.TypeInitializer!,
+      t.GetField("SF")!,
+      t.GetProperty("SP")!,
+      t.GetEvent("SE")!,
+      t.GetMethod("SM")!,
+      t.GetConstructor(BindingFlags.Public | BindingFlags.Instance, binder: null, Type.EmptyTypes, modifiers: null)!,
+      t.GetField("F")!,
+      t.GetProperty("P")!,
+      t.GetEvent("E")!,
+      t.GetMethod("M")!,
     };
 
     Assert.That(
       members.OrderBy(m => m, MemberInfoComparer.StaticMembersFirst),
       Is.EqualTo(new MemberInfo[] {
-        t.GetEvent("SE"),
-        t.GetField("SF"),
-        t.TypeInitializer,
-        t.GetProperty("SP"),
-        t.GetMethod("SM"),
-        t.GetEvent("E"),
-        t.GetField("F"),
-        t.GetConstructor(BindingFlags.Public | BindingFlags.Instance, binder: null, Type.EmptyTypes, modifiers: null),
-        t.GetProperty("P"),
-        t.GetMethod("M"),
+        t.GetEvent("SE")!,
+        t.GetField("SF")!,
+        t.TypeInitializer!,
+        t.GetProperty("SP")!,
+        t.GetMethod("SM")!,
+        t.GetEvent("E")!,
+        t.GetField("F")!,
+        t.GetConstructor(BindingFlags.Public | BindingFlags.Instance, binder: null, Type.EmptyTypes, modifiers: null)!,
+        t.GetProperty("P")!,
+        t.GetMethod("M")!,
       }).AsCollection
     );
   }
diff --git a/tests/Smdn.Reflection.ReverseGenerating.ListApi/Smdn.Reflection.ReverseGenerating.ListApi/VerbosityOption.cs b/tests/Smdn.Reflection.ReverseGenerating.ListApi/Smdn.Reflection.ReverseGenerating.ListApi/VerbosityOption.cs
@@ -23,7 +23,7 @@ class VerbosityOptionTests {
   [TestCase("diagnostic", LogLevel.Trace)]
   [TestCase(null, LogLevel.Information)]
   [TestCase("default", LogLevel.Information)]
-  public void ParseLogLevel(string verbosity, LogLevel expectedLogLevel)
+  public void ParseLogLevel(string? verbosity, LogLevel expectedLogLevel)
   {
     Assert.That(
       expectedLogLevel,
@@ -43,7 +43,7 @@ public void ParseLogLevel(string verbosity, LogLevel expectedLogLevel)
   [TestCase("diagnostic", LoggerVerbosity.Diagnostic)]
   [TestCase(null, LoggerVerbosity.Minimal)]
   [TestCase("default", LoggerVerbosity.Minimal)]
-  public void ParseLoggerVerbosity(string verbosity, LoggerVerbosity expectedLoggerVerbosity)
+  public void ParseLoggerVerbosity(string? verbosity, LoggerVerbosity expectedLoggerVerbosity)
   {
     Assert.That(
       expectedLoggerVerbosity,
