Merge pull request #977 from nunit/fix/correct-trailing-trivia-on-multi-line

fix: Remove trailing trivia to support multi-line actual parameter

Author: mikkelbu

src/nunit.analyzers.codefixes/ConstraintUsage/BaseConditionConstraintCodeFix.cs

@@ -128,7 +128,7 @@ protected virtual (ExpressionSyntax? actual, ExpressionSyntax? constraintExpress
 
             var actualArgument = SyntaxFactory.Argument(actual);
             var actualArgumentWithCorrectTrivia = conditionNode is not null
-                ? actualArgument.WithLeadingTrivia(conditionNode.GetLeadingTrivia()) // ignore the trailing trivia, as there is a following argument
+                ? actualArgument.WithLeadingTrivia(conditionNode.GetLeadingTrivia()).WithoutTrailingTrivia() // remove the trailing trivia, as there is a following argument
                 : actualArgument;
 
             var lastOriginalArgument = assertNode.ArgumentList.Arguments.Last();

src/nunit.analyzers.tests/ConstraintsUsage/EqualConstraintUsageCodeFixTests.cs

@@ -366,5 +366,20 @@ public void CodeFixMaintainsReasonableTriviaWithAllArgumentsOnSameLine([Values]
 
             RoslynAssert.CodeFix(analyzer, fix, equalConstraintDiagnostic, code, fixedCode);
         }
+
+        [Test]
+        public void CodeFixMaintainsReasonableTriviaWhenActualArgumentIsMultipleLines()
+        {
+            var code = TestUtility.WrapInTestMethod($@"
+            var someVeryLongActualVariableName = ""abc"";
+            Assert.That(↓someVeryLongActualVariableName
+                        .Equals(""abc""), Is.True);");
+
+            var fixedCode = TestUtility.WrapInTestMethod($@"
+            var someVeryLongActualVariableName = ""abc"";
+            Assert.That(someVeryLongActualVariableName, Is.EqualTo(""abc""));");
+
+            RoslynAssert.CodeFix(analyzer, fix, equalConstraintDiagnostic, code, fixedCode);
+        }
     }
 }

src/nunit.analyzers.tests/ConstraintsUsage/SomeItemsConstraintUsageCodeFixTests.cs

@@ -156,5 +156,20 @@ public void CodeFixMaintainsReasonableTriviaWithAllArgumentsOnSameLine([Values]
 
             RoslynAssert.CodeFix(analyzer, fix, doesNotContainDiagnostic, testCode, fixedCode);
         }
+
+        [Test]
+        public void CodeFixMaintainsReasonableTriviaWhenActualArgumentIsMultipleLines()
+        {
+            var testCode = TestUtility.WrapInTestMethod($@"
+            ClassicAssert.IsFalse(↓new[] {{ 1, 2, 3 }}
+                                  .Contains(1), ""message"");",
+                additionalUsings: "using System.Linq;");
+
+            var fixedCode = TestUtility.WrapInTestMethod($@"
+            Assert.That(new[] {{ 1, 2, 3 }}, Does.Not.Contain(1), ""message"");",
+                additionalUsings: "using System.Linq;");
+
+            RoslynAssert.CodeFix(analyzer, fix, doesNotContainDiagnostic, testCode, fixedCode);
+        }
     }
 }

src/nunit.analyzers.tests/ConstraintsUsage/StringConstraintUsageCodeFixTests.cs

@@ -178,5 +178,24 @@ public void CodeFixMaintainsReasonableTriviaWithAllArgumentsOnSameLine(
 
             RoslynAssert.CodeFix(analyzer, fix, ExpectedDiagnostic.Create(analyzerId), code, fixedCode);
         }
+
+        [Test]
+        public void CodeFixMaintainsReasonableTriviaWhenActualArgumentIsMultipleLines()
+        {
+            var code = TestUtility.WrapInTestMethod($@"
+            Assert.That(↓SomeReallyLongMethodName()
+                        .Contains(""Lorem ipsum dolor sit amet, consectetur adipiscing elit,""),
+                        Is.True);
+
+            string SomeReallyLongMethodName() => ""Long string"";");
+
+            var fixedCode = TestUtility.WrapInTestMethod($@"
+            Assert.That(SomeReallyLongMethodName(),
+                        Does.Contain(""Lorem ipsum dolor sit amet, consectetur adipiscing elit,""));
+
+            string SomeReallyLongMethodName() => ""Long string"";");
+
+            RoslynAssert.CodeFix(analyzer, fix, ExpectedDiagnostic.Create(AnalyzerIdentifiers.StringContainsConstraintUsage), code, fixedCode);
+        }
     }
 }