Ignore close brace in a CommandElementAst

Author: Kapil Borle

Engine/TokenOperations.cs

@@ -55,7 +55,7 @@ public IEnumerable<Token> GetOpenBracesInCommandElements()
         /// In the above example it will return the close brace following "powershell".
         /// </summary>
         /// <returns>An enumerable of type Token</returns>
-        public IEnumerable<Token> GetCloseBraceInCommandElement()
+        public IEnumerable<Token> GetCloseBracesInCommandElements()
         {
             return GetBraceInCommandElement(TokenKind.RCurly);
         }

Rules/PlaceCloseBrace.cs

@@ -36,6 +36,8 @@ public class PlaceCloseBrace : ConfigurableScriptRule
         [ConfigurableRuleProperty(defaultValue:false)]
         public bool NoEmptyLineBefore { get; protected set; }
 
+        private HashSet<Token> tokensToIgnore;
+
         /// <summary>
         /// Analyzes the given ast to find violations.
         /// </summary>
@@ -62,6 +64,8 @@ public override IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string file
             var tokens = Helper.Instance.Tokens;
             var diagnosticRecords = new List<DiagnosticRecord>();
             var curlyStack = new Stack<Tuple<Token, int>> ();
+            tokensToIgnore = new HashSet<Token> (
+                new TokenOperations(tokens, ast).GetCloseBracesInCommandElements());
 
             for (int k = 0; k < tokens.Length; k++)
             {
@@ -251,7 +255,8 @@ private DiagnosticRecord GetViolationForBraceShouldBeOnNewLine(Token[] tokens, i
             if (tokens.Length > 1 && tokens.Length > closeBracePos)
             {
                 var closeBraceToken = tokens[closeBracePos];
-                if (tokens[closeBracePos - 1].Kind != TokenKind.NewLine)
+                if (tokens[closeBracePos - 1].Kind != TokenKind.NewLine
+                    && !tokensToIgnore.Contains(closeBraceToken))
                 {
                     return new DiagnosticRecord(
                         GetError(Strings.PlaceCloseBraceErrorShouldBeOnNewLine),

Tests/Rules/PlaceCloseBrace.tests.ps1

@@ -77,4 +77,17 @@ $hashtable = @{
             $violations.Count | Should Be 1
         }
     }
+
+    Context "When a close brace is on the same line as its open brace" {
+        BeforeAll {
+            $def = @'
+Get-Process * | % { "blah" }
+'@
+            $violations = Invoke-ScriptAnalyzer -ScriptDefinition $def -Settings $settings
+        }
+
+        It "Should not find a violation" {
+            $violations.Count | Should Be 0
+        }
+    }
 }