Merge pull request #2836 from vweijsters/fix-2774

Fixed indentation check issue where opening brace was always considered, even if it was…

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1137UnitTests.cs

@@ -2015,5 +2015,34 @@ private class TestClass2
 
             await VerifyCSharpFixAsync(testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
         }
+
+        [Fact]
+        [WorkItem(2774, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/2774")]
+        public async Task VerifyThatBraceOnSameLineAsOtherCodeAsync()
+        {
+            var testCode = @"
+public class TestClass
+{
+    public void TestMethod()
+    {
+        var x = TestMethod2(new TestClass2 {
+            TestValue = 12,
+        });
+    }
+
+    public int TestMethod2(TestClass2 input)
+    {
+        return 0;
+    }
+}
+
+public class TestClass2
+{
+    public int TestValue { get; set; }
+}
+";
+
+            await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1137ElementsShouldHaveTheSameIndentation.cs

@@ -480,6 +480,12 @@ private static void CheckBraces(SyntaxNodeAnalysisContext context, SyntaxToken o
                 return;
             }
 
+            if (!openBraceToken.IsFirstInLine())
+            {
+                // Do not check brace indentation if the opening brace is not the first token on a line.
+                return;
+            }
+
             SyntaxTrivia openBraceIndentationTrivia = openBraceToken.LeadingTrivia.LastOrDefault();
             string openBraceIndentation = openBraceIndentationTrivia.IsKind(SyntaxKind.WhitespaceTrivia) ? openBraceIndentationTrivia.ToString() : string.Empty;