- fix warnigs

bluehands · Dec 18, 2023 · 9a38b38 · 9a38b38
1 parent 58a77f9
commit 9a38b38
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 13 deletions.
diff --git a/Source/FunicularSwitch.Generators.FluentAssertions/FluentAssertionMethods/Generator.cs b/Source/FunicularSwitch.Generators.FluentAssertions/FluentAssertionMethods/Generator.cs
@@ -24,7 +24,7 @@ internal static class Generator
     {
         var resultTypeNameFullName = resultTypeSchema.ResultType.FullTypeName().Replace('.', '_');
         var resultTypeFullNameWithNamespace = resultTypeSchema.ResultType.FullTypeNameWithNamespace();
-        var resultTypeNamespace = resultTypeSchema.ResultType.GetFullNamespace();
+        var resultTypeNamespace = resultTypeSchema.ResultType.GetFullNamespace()!;
 
         var errorTypeNameFullName = resultTypeSchema.ErrorType?.FullTypeNameWithNamespace() ?? typeof(string).FullName;
 
@@ -44,7 +44,7 @@ string Replace(string code, params string[] additionalNamespaces)
                             .Append(resultTypeNamespace)
                             .Distinct()
                             .Select(a => $"using {a};")
-                            .ToSeparatedString(Environment.NewLine));
+                            .ToSeparatedString("\n"));
             return code;
         }
 
@@ -81,7 +81,7 @@ string Replace(string code, params string[] additionalNamespaces)
                         .Append(unionTypeNamespace)
                         .Distinct()
                         .Select(a => $"using {a};")
-                        .ToSeparatedString(Environment.NewLine));
+                        .ToSeparatedString("\n"));
             return code;
         }
 

diff --git a/...ularSwitch.Generators.FluentAssertions/FunicularSwitch.Generators.FluentAssertions.csproj b/...ularSwitch.Generators.FluentAssertions/FunicularSwitch.Generators.FluentAssertions.csproj
@@ -13,6 +13,7 @@
 	<PropertyGroup>
 		<IsPackable>true</IsPackable>
 		<IncludeBuildOutput>false</IncludeBuildOutput>
+		<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
 
 		<VersionSuffixLocal />
 		<!--When variable is set we are building a prerelease package-->

diff --git a/...nTypeGenerator/FunicularSwitchGeneratorsConsumerWithPrimaryConstructorMatchExtension.g.cs b/...nTypeGenerator/FunicularSwitchGeneratorsConsumerWithPrimaryConstructorMatchExtension.g.cs
@@ -59,7 +59,7 @@ public static async Task Switch(this Task<FunicularSwitch.Generators.Consumer.Wi
 
 	public abstract partial class WithPrimaryConstructor
 	{
-		public static FunicularSwitch.Generators.Consumer.WithPrimaryConstructor DerivedWithPrimaryConstructor(string Blubs, int test) => new FunicularSwitch.Generators.Consumer.DerivedWithPrimaryConstructor(Blubs, test);
+		public static FunicularSwitch.Generators.Consumer.WithPrimaryConstructor DerivedWithPrimaryConstructor(string message, int test) => new FunicularSwitch.Generators.Consumer.DerivedWithPrimaryConstructor(message, test);
 	}
 }
 #pragma warning restore 1591
diff --git a/Source/Tests/FunicularSwitch.Generators.Consumer/GeneratorSpecs.cs b/Source/Tests/FunicularSwitch.Generators.Consumer/GeneratorSpecs.cs
@@ -181,7 +181,8 @@ select x
     [TestMethod]
     public void TestFactoryMethodsForClassesWithPrimaryConstructor()
     {
-        var _ = WithPrimaryConstructor.DerivedWithPrimaryConstructor("Hallo", 42);
+        var x = WithPrimaryConstructor.DerivedWithPrimaryConstructor("Hallo", 42);
+		Console.WriteLine($"Created {x.Match(d => $"{d.Message} {d.Test}")}");
     }
 }
 
@@ -278,6 +279,12 @@ public override bool Equals(object? obj)
 }
 
 [UnionType]
-public abstract partial class WithPrimaryConstructor(int Test);
+public abstract partial class WithPrimaryConstructor(int test)
+{
+    public int Test { get; } = test;
+}
 
-public class DerivedWithPrimaryConstructor(string Blubs, int test) : WithPrimaryConstructor(test);
+public class DerivedWithPrimaryConstructor(string message, int test) : WithPrimaryConstructor(test)
+{
+    public string Message { get; } = message;
+}
diff --git a/Source/Tests/FunicularSwitch.Test/FunicularSwitch.Test.csproj b/Source/Tests/FunicularSwitch.Test/FunicularSwitch.Test.csproj
@@ -21,6 +21,7 @@
 		<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.6.0" />
 		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0" />
 		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="1.1.1" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.6.0" />
 		<PackageReference Include="Microsoft.CodeAnalysis.Testing.Verifiers.MSTest" Version="1.1.1" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
 		<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />

diff --git a/Source/Tests/FunicularSwitch.Test/ImplicitCastStudy.cs b/Source/Tests/FunicularSwitch.Test/ImplicitCastStudy.cs
@@ -1,5 +1,4 @@
-using FluentAssertions;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace FunicularSwitch.Test;
 
@@ -11,16 +10,20 @@ public class ImplicitCastStudy
 	public void ImplicitCastWithNullableStruct()
 	{
 		long? l = null;
-		Option<long> converted = l;
-		converted.Should().NotBeNull();
+#pragma warning disable CS8600 // Converting null literal or possible null value to non-nullable type.
+        Option<long> converted = l;
+#pragma warning restore CS8600 // Converting null literal or possible null value to non-nullable type.
+        converted.Should().NotBeNull();
 	}
 
 	[TestMethod]
 	public void ImplicitCastWithClass()
 	{
 		object? l = null;
-		Option<object> converted = l;
-		converted.Should().NotBeNull();
+#pragma warning disable CS8604 // Possible null reference argument.
+        Option<object> converted = l;
+#pragma warning restore CS8604 // Possible null reference argument.
+        converted.Should().NotBeNull();
 	}
 
 	[TestMethod]