Fix EqualsNull code fix to keep EndOfLineTrivia. (#99)

maroontress · Mar 15, 2019 · 58dcb6a · 58dcb6a
1 parent 6258cef
commit 58dcb6a
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 12 deletions.
diff --git a/StyleChecker/StyleChecker.Test/Refactoring/EqualsNull/Code.cs b/StyleChecker/StyleChecker.Test/Refactoring/EqualsNull/Code.cs
@@ -28,5 +28,15 @@ public void NullableValueType(int? value)
                 return;
             }
         }
+
+        public void EndOfLineTrivia(object value)
+        {
+            if (value != null
+            //@ ^!=
+                && value.ToString() == "")
+            {
+                return;
+            }
+        }
     }
 }
diff --git a/StyleChecker/StyleChecker.Test/Refactoring/EqualsNull/CodeFix.cs b/StyleChecker/StyleChecker.Test/Refactoring/EqualsNull/CodeFix.cs
@@ -25,5 +25,14 @@ public void NullableValueType(int? value)
                 return;
             }
         }
+
+        public void EndOfLineTrivia(object value)
+        {
+            if (!(value is null)
+                && value.ToString() == "")
+            {
+                return;
+            }
+        }
     }
 }
diff --git a/StyleChecker/StyleChecker.Test/Refactoring/IsNull/Code.cs b/StyleChecker/StyleChecker.Test/Refactoring/IsNull/Code.cs
@@ -37,5 +37,15 @@ public void KeepTrivia(string value)
                 return;
             }
         }
+
+        public void EndOfLineTrivia(object value)
+        {
+            if (!(value is null)
+            //@ ^!=
+                && value.ToString() == "")
+            {
+                return;
+            }
+        }
     }
 }
diff --git a/StyleChecker/StyleChecker.Test/Refactoring/IsNull/CodeFix.cs b/StyleChecker/StyleChecker.Test/Refactoring/IsNull/CodeFix.cs
@@ -33,5 +33,14 @@ public void KeepTrivia(string value)
                 return;
             }
         }
+
+        public void EndOfLineTrivia(object value)
+        {
+            if (value != null
+                && value.ToString() == "")
+            {
+                return;
+            }
+        }
     }
 }
diff --git a/StyleChecker/StyleChecker/Refactoring/EqualsNull/CodeFixer.cs b/StyleChecker/StyleChecker/Refactoring/EqualsNull/CodeFixer.cs
@@ -84,23 +84,37 @@ private static async Task<Solution> Replace(
             var root = await document.GetSyntaxRootAsync(cancellationToken)
                 .ConfigureAwait(false);
 
-            var newNode = SyntaxFactory.IsPatternExpression(
-                node.Left,
-                SyntaxFactory.Token(SyntaxKind.IsKeyword)
-                    .WithTriviaFrom(node.OperatorToken),
-                SyntaxFactory.ConstantPattern(
-                    SyntaxFactory.LiteralExpression(
-                        SyntaxKind.NullLiteralExpression))
-                    .WithTriviaFrom(node.Right)) as ExpressionSyntax;
+            var right = node.Right;
+            var @null = SyntaxFactory.ConstantPattern(
+                SyntaxFactory.LiteralExpression(
+                    SyntaxKind.NullLiteralExpression));
+            var @is = SyntaxFactory.Token(SyntaxKind.IsKeyword)
+                .WithTriviaFrom(node.OperatorToken);
 
-            if (node.OperatorToken.Kind()
-                == SyntaxKind.ExclamationEqualsToken)
+            ExpressionSyntax NewEqualNode()
             {
-                newNode = SyntaxFactory.PrefixUnaryExpression(
+                return SyntaxFactory.IsPatternExpression(
+                    node.Left,
+                    @is,
+                    @null.WithTriviaFrom(right));
+            }
+
+            ExpressionSyntax NewNotEqualNode()
+            {
+                var n = SyntaxFactory.IsPatternExpression(
+                    node.Left,
+                    @is,
+                    @null.WithLeadingTrivia(right.GetLeadingTrivia()));
+                return SyntaxFactory.PrefixUnaryExpression(
                     SyntaxKind.LogicalNotExpression,
-                    SyntaxFactory.ParenthesizedExpression(newNode));
+                    SyntaxFactory.ParenthesizedExpression(n)
+                        .WithTrailingTrivia(right.GetTrailingTrivia()));
             }
 
+            var newNode = (node.OperatorToken.Kind()
+                    == SyntaxKind.ExclamationEqualsToken)
+                ? NewNotEqualNode()
+                : NewEqualNode();
             newNode = newNode.WithTriviaFrom(node);
 
             var newRoot = root.ReplaceNode(node, newNode);