Fix trivia for NUnit2007

nunit · Sep 12, 2024 · 8b2e749 · 8b2e749
1 parent 90602b4
commit 8b2e749
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/src/nunit.analyzers.tests/ConstActualValueUsage/ConstActualValueUsageCodeFixTests.cs b/src/nunit.analyzers.tests/ConstActualValueUsage/ConstActualValueUsageCodeFixTests.cs
@@ -45,6 +45,32 @@ public void Test()
                 fixTitle: ConstActualValueUsageCodeFix.SwapArgumentsDescription);
         }
 
+        [TestCase(nameof(ClassicAssert.AreEqual))]
+        [TestCase(nameof(ClassicAssert.AreNotEqual))]
+        [TestCase(nameof(ClassicAssert.AreSame))]
+        [TestCase(nameof(ClassicAssert.AreNotSame))]
+        public void LiteralArgumentIsProvidedForClassicAssertCodeFixWithNewLine(string classicAssertMethod)
+        {
+            var code = TestUtility.WrapMethodInClassNamespaceAndAddUsings($@"
+                public void Test()
+                {{
+                    int expected = 5;
+                    ClassicAssert.{classicAssertMethod}(expected,
+                        ↓1);
+                }}");
+
+            var fixedCode = TestUtility.WrapMethodInClassNamespaceAndAddUsings($@"
+                public void Test()
+                {{
+                    int expected = 5;
+                    ClassicAssert.{classicAssertMethod}(1,
+                        expected);
+                }}");
+
+            RoslynAssert.CodeFix(analyzer, fix, expectedDiagnostic, code, fixedCode,
+                fixTitle: ConstActualValueUsageCodeFix.SwapArgumentsDescription);
+        }
+
         [TestCase(nameof(ClassicAssert.AreEqual))]
         public void LiteralArgumentIsProvidedForClassicAssertWithDeltaCodeFix(string classicAssertMethod)
         {

diff --git a/src/nunit.analyzers/ConstActualValueUsage/ConstActualValueUsageCodeFix.cs b/src/nunit.analyzers/ConstActualValueUsage/ConstActualValueUsageCodeFix.cs
@@ -84,7 +84,9 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
 
             var newRoot = root
                 .ReplaceNodes(new[] { expectedArgument, actualArgument },
-                    (node, _) => node == actualArgument ? expectedArgument : actualArgument);
+                    (node, _) => node == actualArgument
+                        ? expectedArgument.WithTriviaFrom(actualArgument)
+                        : actualArgument.WithTriviaFrom(expectedArgument));
 
             var codeAction = CodeAction.Create(
                 SwapArgumentsDescription,