Fix RCS1085 (#1120)

Co-authored-by: Josef Pihrt <josef@pihrt.net>

Author: jamesHargreaves12

ChangeLog.md

@@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix [RCS1211](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1211) ([#1095](https://github.com/JosefPihrt/Roslynator/pull/1095)).
 - Fix [RCS0005](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS0005) ([#1114](https://github.com/JosefPihrt/Roslynator/pull/1114)).
 - Fix [RCS1176](https://github.com/JosefPihrt/Roslynator/blob/main/docs/analyzers/RCS1176.md) ([#1122](https://github.com/JosefPihrt/Roslynator/pull/1122)).
+- Fix [RCS1085](https://github.com/JosefPihrt/Roslynator/blob/main/docs/analyzers/RCS1085.md) ([#1120](https://github.com/josefpihrt/roslynator/pull/1120)).
 
 ## [4.3.0] - 2023-04-24
 

src/CSharp/CSharp/SyntaxRewriters/WhitespaceRemover.cs

@@ -41,13 +41,20 @@ public override SyntaxTrivia VisitTrivia(SyntaxTrivia trivia)
 
         if (trivia.IsKind(SyntaxKind.EndOfLineTrivia))
         {
-            // We can only safely remove EndOfLineTrivia if it is not proceeded by a SingleLineComment
-            int triviaIndex = trivia.Token.TrailingTrivia.IndexOf(trivia);
+            SyntaxTriviaList triviaList = trivia.Token.TrailingTrivia;
+            int triviaIndex = triviaList.IndexOf(trivia);
+
+            if (triviaIndex == -1)
+            {
+                triviaList = trivia.Token.LeadingTrivia;
+                triviaIndex = triviaList.IndexOf(trivia);
+            }
+
             if (triviaIndex == 0)
                 return Replacement;
 
-            SyntaxTrivia prevTrivia = trivia.Token.TrailingTrivia[triviaIndex - 1];
-            if (!prevTrivia.IsKind(SyntaxKind.SingleLineCommentTrivia))
+            // We can only safely remove EndOfLineTrivia if it is not proceeded by a SingleLineComment
+            if (!triviaList[triviaIndex - 1].IsKind(SyntaxKind.SingleLineCommentTrivia))
                 return Replacement;
         }
 

src/Tests/Analyzers.Tests/RCS1085UseAutoPropertyTests.cs

@@ -919,6 +919,37 @@ class C
 class MyAttribute : Attribute
 {
 }
+");
+    }
+
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.UseAutoProperty)]
+    public async Task TestFix_WithLeadingWhitespace()
+    {
+        await VerifyDiagnosticAndFixAsync(@"
+class C
+{
+    public int [|P|]
+        {
+
+
+            get
+            { 
+                return p; 
+            }
+
+            set
+            {
+                p = value;
+            }
+        }
+
+    private int p;
+}
+", @"
+class C
+{
+    public int P { get; set; }
+}
 ");
     }
 }