Made things work properly for the normal situation as well

Author: vweijsters

StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/MaintainabilityRules/SA1119CodeFixProvider.cs

@@ -68,10 +68,17 @@ private static SyntaxNode GetReplacement(ParenthesizedExpressionSyntax oldNode)
             var trailingTrivia = oldNode.Expression.GetTrailingTrivia().AddRange(oldNode.CloseParenToken.GetAllTrivia());
 
             // Workaround for Roslyn not handling elastic markers for directive trivia correctly.
-            var leadingSeparator = (oldNode.Parent is DirectiveTriviaSyntax) ? SyntaxFactory.Space : SyntaxFactory.ElasticMarker;
+            if (!leadingTrivia.Any())
+            {
+                var previousToken = oldNode.OpenParenToken.GetPreviousToken();
+                if (TriviaHelper.IndexOfTrailingWhitespace(previousToken.TrailingTrivia) == -1)
+                {
+                    leadingTrivia = SyntaxFactory.TriviaList(SyntaxFactory.Space);
+                }
+            }
 
             return oldNode.Expression
-                .WithLeadingTrivia(leadingTrivia.Any() ? leadingTrivia : SyntaxFactory.TriviaList(leadingSeparator))
+                .WithLeadingTrivia(leadingTrivia)
                 .WithTrailingTrivia(trailingTrivia.Any() ? trailingTrivia : SyntaxFactory.TriviaList(SyntaxFactory.ElasticMarker));
         }
 

StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1119UnitTests.cs

@@ -1418,6 +1418,9 @@ public static void Main(string[] args)
 
 #endif
 
+#if (DEBUG)
+
+#endif
     }
 }
 ";
@@ -1431,6 +1434,9 @@ public static void Main(string[] args)
 
 #endif
 
+#if DEBUG
+
+#endif
     }
 }
 ";
@@ -1439,6 +1445,9 @@ public static void Main(string[] args)
                 this.CSharpDiagnostic(DiagnosticId).WithLocation(6, 4),
                 this.CSharpDiagnostic(ParenthesesDiagnosticId).WithLocation(6, 4),
                 this.CSharpDiagnostic(ParenthesesDiagnosticId).WithLocation(6, 10),
+                this.CSharpDiagnostic(DiagnosticId).WithLocation(10, 5),
+                this.CSharpDiagnostic(ParenthesesDiagnosticId).WithLocation(10, 5),
+                this.CSharpDiagnostic(ParenthesesDiagnosticId).WithLocation(10, 11),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);