fix warnings

GuOrg · Apr 5, 2023 · 055bb10 · 055bb10
1 parent b3ed621
commit 055bb10
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 33 deletions.
diff --git a/Gu.Roslyn.Asserts.Tests/RoslynAssertTests/Valid.Success.cs b/Gu.Roslyn.Asserts.Tests/RoslynAssertTests/Valid.Success.cs
@@ -293,9 +293,9 @@ public class C
         [TestCase("m_")]
         public static void AnalyzerWithConfiguration(string? prefix)
         {
-            string? analyzerConfig = prefix is null ? null :
+            var analyzerConfig = prefix is null ? null :
                 $"dotnet_diagnostic.SA1309.field_name_prefix = {prefix}";
-            string prefixToUse = prefix ?? "_";
+            var prefixToUse = prefix ?? "_";
 
             var code = @$"
 namespace N

diff --git a/Gu.Roslyn.Asserts.Tests/TestHelpers/CodeFixes/RenameHelper.cs b/Gu.Roslyn.Asserts.Tests/TestHelpers/CodeFixes/RenameHelper.cs
@@ -13,12 +13,7 @@ internal static async Task<Solution> RenameSymbolAsync(Document document, Syntax
     {
         var annotatedRoot = root.ReplaceToken(declarationToken, declarationToken.WithAdditionalAnnotations(RenameAnnotation.Create()));
         var annotatedSolution = document.Project.Solution.WithDocumentSyntaxRoot(document.Id, annotatedRoot);
-        var annotatedDocument = annotatedSolution.GetDocument(document.Id);
-        if (annotatedDocument is null)
-        {
-            throw new InvalidOperationException($"Did not find a document matching {document.Name}");
-        }
-
+        var annotatedDocument = annotatedSolution.GetDocument(document.Id) ?? throw new InvalidOperationException($"Did not find a document matching {document.Name}");
         annotatedRoot = await annotatedDocument.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
         var annotatedToken = annotatedRoot.FindToken(declarationToken.SpanStart);
 

diff --git a/Gu.Roslyn.Asserts/Ast/SyntaxFactoryWriter.cs b/Gu.Roslyn.Asserts/Ast/SyntaxFactoryWriter.cs
@@ -125,12 +125,7 @@ private SyntaxFactoryWriter Write(SyntaxNode node)
         var parameters = method.GetParameters();
         foreach (var parameter in parameters)
         {
-            var writer = ArgumentWriters[parameter];
-            if (writer is null)
-            {
-                throw new NotSupportedException($"Could not write {parameter}");
-            }
-
+            var writer = ArgumentWriters[parameter] ?? throw new NotSupportedException($"Could not write {parameter}");
             writer.Invoke(this, node, parameter.Position == parameters.Length - 1);
         }
 

diff --git a/Gu.Roslyn.Asserts/ProjectFile.cs b/Gu.Roslyn.Asserts/ProjectFile.cs
@@ -67,12 +67,7 @@ public static bool TryFind(string projectFile, [NotNullWhen(true)] out FileInfo?
     public static FileInfo Find(string projectFile)
     {
         var sln = SolutionFile.Find(Assembly.GetCallingAssembly());
-        var result = sln.Directory!.EnumerateFiles(projectFile, SearchOption.AllDirectories).FirstOrDefault();
-        if (result is null)
-        {
-            throw new InvalidOperationException("Did not find a file named: " + projectFile);
-        }
-
+        var result = sln.Directory!.EnumerateFiles(projectFile, SearchOption.AllDirectories).FirstOrDefault() ?? throw new InvalidOperationException("Did not find a file named: " + projectFile);
         return result;
     }
 
@@ -178,12 +173,7 @@ IEnumerable<DocumentInfo> GetDocuments()
 
                 foreach (var compile in compiles)
                 {
-                    var include = compile.Attribute("Include")?.Value;
-                    if (include is null)
-                    {
-                        throw new InvalidOperationException("Parsing failed, no Include found.");
-                    }
-
+                    var include = compile.Attribute("Include")?.Value ?? throw new InvalidOperationException("Parsing failed, no Include found.");
                     var csFile = Path.Combine(csproj.Directory!.FullName, include);
                     yield return CreateDocumentInfo(new FileInfo(csFile));
                 }
@@ -219,12 +209,7 @@ IEnumerable<MetadataReference> GetMetadataReferences()
 
                 foreach (var compile in compiles)
                 {
-                    var include = compile.Attribute("Include")?.Value;
-                    if (include is null)
-                    {
-                        throw new InvalidOperationException("Parsing failed, no Include found.");
-                    }
-
+                    var include = compile.Attribute("Include")?.Value ?? throw new InvalidOperationException("Parsing failed, no Include found.");
                     if (include.Contains("\\") &&
                         Path.Combine(csproj.Directory.FullName, include) is { } fileName &&
                         File.Exists(fileName))

diff --git a/Gu.Roslyn.Asserts/RoslynAssert.cs b/Gu.Roslyn.Asserts/RoslynAssert.cs
@@ -213,7 +213,7 @@ private static void VerifyDiagnostics(
 
         var missedDiagnostics = expectedDiagnostics.Where(e => !allDiagnostics.Any(a => e.Matches(a))).ToList();
         var unexpectedDiagnostics = allDiagnostics.Where(a => !expectedDiagnostics.Any(e => e.Matches(a))).ToList();
-        int matchedDiagnostics = expectedDiagnostics.Count - missedDiagnostics.Count;
+        var matchedDiagnostics = expectedDiagnostics.Count - missedDiagnostics.Count;
 
         var error = StringBuilderPool.Borrow();
         error.AppendLine("Expected and actual diagnostics do not match.");