Merge pull request #1605 from vweijsters/fix-1583

Author: sharwell

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

@@ -393,6 +393,17 @@ public object[] ExpressionBodiedMethod() =>
             3
         }
         .Contains(3);
+
+    // This is a regression test for https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/1583
+    public void TestTernaryConstruction()
+    {
+        var target = contained
+            ? new Dictionary<string, string>
+                {
+                    { ""target"", ""_parent"" }
+                }
+            : new Dictionary<string, string>();
+    }
 }
 ";
 

StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1513ClosingCurlyBracketMustBeFollowedByBlankLine.cs

@@ -249,6 +249,12 @@ private void AnalyzeCloseBrace(SyntaxToken token)
                         return;
                     }
 
+                    if (nextToken.IsKind(SyntaxKind.ColonToken))
+                    {
+                        // the close brace is in the first part of a conditional expression.
+                        return;
+                    }
+
                     if (nextToken.IsKind(SyntaxKind.AddKeyword)
                         || nextToken.IsKind(SyntaxKind.RemoveKeyword)
                         || nextToken.IsKind(SyntaxKind.GetKeyword)