Merge pull request #2309 from KlemensE/master

Fixes issue #2306

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1513UnitTests.cs

@@ -358,6 +358,23 @@ public void MultiLineLinqQuery()
                               }).ToList();
     }
 
+    // This is a regression test for https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/2306
+    public void MultiLineGroupByLinqQuery()
+    {
+        var someQuery = from f in Enumerable.Empty<int>()
+                        group f by new
+                        {
+                            f,
+                        }
+                        into a
+                        select a;
+
+        var someOtherQuery = from f in Enumerable.Empty<int>()
+                             group f by new { f }
+                             into a
+                             select a;
+    }
+
     // This is a regression test for https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/1049
     public object[] ExpressionBodiedProperty =>
         new[]

StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1513ClosingBraceMustBeFollowedByBlankLine.cs

@@ -230,10 +230,15 @@ private void AnalyzeCloseBrace(SyntaxToken token)
                         return;
                     }
 
-                    if (IsPartOf<QueryExpressionSyntax>(token) && ((nextToken.Parent is QueryClauseSyntax) || (nextToken.Parent is SelectOrGroupClauseSyntax)))
+                    if (IsPartOf<QueryExpressionSyntax>(token))
                     {
-                        // the close brace is part of a query expression
-                        return;
+                        if (nextToken.Parent is QueryClauseSyntax
+                            || nextToken.Parent is SelectOrGroupClauseSyntax
+                            || nextToken.Parent is QueryContinuationSyntax)
+                        {
+                            // the close brace is part of a query expression
+                            return;
+                        }
                     }
 
                     if (IsPartOf<ArgumentListSyntax>(token))