Use WithTriviaFrom(currentAssignment) and add tests

dotnet · Jun 23, 2021 · 9e428fe · CyrusNajmabadi · Jun 23, 2021 · 9e428fe
1 parent d7199c5
commit 9e428fe
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/src/Analyzers/CSharp/Tests/UseCompoundAssignment/UseCompoundAssignmentTests.cs b/src/Analyzers/CSharp/Tests/UseCompoundAssignment/UseCompoundAssignmentTests.cs
@@ -1160,6 +1160,36 @@ int M(int i)
  }}
 }}",
 @$"public class C
+{{
+ int M(int i)
+ {{
+ {after}
+ }}
+}}");
+ }
+
+ [WorkItem(38054, "https://github.com/dotnet/roslyn/issues/53969")]
+ [Theory, Trait(Traits.Feature, Traits.Features.CodeActionsUseCompoundAssignment)]
+ [InlineData(
+ "/* Before */ i [||]= i + 1; /* After */",
+ "/* Before */ i++; /* After */")]
+ [InlineData(
+ "M( /* Before */ i [||]= i + 1 /* After */ );",
+ "M( /* Before */ ++i /* After */ );")]
+ [InlineData(
+ "M( /* Before */ i [||]= i - 1 /* After */ );",
+ "M( /* Before */ --i /* After */ );")]
+ public async Task TestTriviaPreserved(string before, string after)
+ {
+ await TestInRegularAndScript1Async(
+@$"public class C
+{{
+ int M(int i)
+ {{
+ {before}
+ }}
+}}",
+@$"public class C
 {{
  int M(int i)
  {{

diff --git a/...zers/Core/CodeFixes/UseCompoundAssignment/AbstractUseCompoundAssignmentCodeFixProvider.cs b/...zers/Core/CodeFixes/UseCompoundAssignment/AbstractUseCompoundAssignmentCodeFixProvider.cs
@@ -81,12 +81,12 @@ protected override Task FixAllAsync(
 
  if (diagnostic.Properties.ContainsKey(UseCompoundAssignmentUtilities.Increment))
  {
- return Increment((TExpressionSyntax)leftOfAssign.WithoutTrailingTrivia(), postfix: syntaxFacts.IsSimpleAssignmentStatement(currentAssignment.Parent));
+ return Increment((TExpressionSyntax)leftOfAssign.WithTriviaFrom(currentAssignment), postfix: syntaxFacts.IsSimpleAssignmentStatement(currentAssignment.Parent));
  }
 
  if (diagnostic.Properties.ContainsKey(UseCompoundAssignmentUtilities.Decrement))
  {
- return Decrement((TExpressionSyntax)leftOfAssign.WithoutTrailingTrivia(), postfix: syntaxFacts.IsSimpleAssignmentStatement(currentAssignment.Parent));
+ return Decrement((TExpressionSyntax)leftOfAssign.WithTriviaFrom(currentAssignment), postfix: syntaxFacts.IsSimpleAssignmentStatement(currentAssignment.Parent));
  }
 
  var assignmentOpKind = _binaryToAssignmentMap[syntaxKinds.Convert<TSyntaxKind>(rightOfAssign.RawKind)];