Disable NoNewLineAfter property in PlaceCloseBrace rule

Author: Kapil Borle

Rules/PlaceCloseBrace.cs

@@ -29,7 +29,10 @@ namespace Microsoft.Windows.PowerShell.ScriptAnalyzer.BuiltinRules
     public class PlaceCloseBrace : ConfigurableScriptRule
     {
         [ConfigurableRuleProperty()]
-        public bool Enable {get; protected set;} = false;
+        public bool Enable { get; protected set; } = false;
+
+        [ConfigurableRuleProperty()]
+        public bool NoEmptyLineBefore { get; protected set; } = false;
 
         /// <summary>
         /// Analyzes the given ast to find the [violation]
@@ -80,9 +83,13 @@ public override IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string file
                         AddToDiagnosticRecords(
                             GetViolationForBraceOnSameLine(tokens, k, openBracePos, fileName),
                             ref diagnosticRecords);
-                        AddToDiagnosticRecords(
-                            GetViolationForEmptyLineBeforeBrace(tokens, k, openBracePos, fileName),
-                            ref diagnosticRecords);
+
+                        if (NoEmptyLineBefore)
+                        {
+                            AddToDiagnosticRecords(
+                                GetViolationForEmptyLineBeforeBrace(tokens, k, openBracePos, fileName),
+                                ref diagnosticRecords);
+                        }
                     }
                     else
                     {

Tests/Rules/PlaceCloseBrace.tests.ps1

@@ -1,5 +1,15 @@
 Import-Module PSScriptAnalyzer
 $ruleName = "PSPlaceCloseBrace"
+$settings = @{
+    IncludeRules = @("PSPlaceCloseBrace")
+    Rules = @{
+        PSPlaceCloseBrace = @{
+            Enable = $true
+            NoEmptyLineBefore = $true
+        }
+    }
+}
+
 
 Describe "PlaceCloseBrace" {
     Context "When a close brace is not on a new line" {
@@ -8,7 +18,7 @@ Describe "PlaceCloseBrace" {
 function foo {
     Write-Output "close brace not on a new line"}
 '@
-            $violations = Invoke-ScriptAnalyzer -ScriptDefinition $def -IncludeRule $ruleName
+            $violations = Invoke-ScriptAnalyzer -ScriptDefinition $def -Settings $settings
         }
 
         It "Should find a violation" {
@@ -28,7 +38,7 @@ function foo {
 
 }
 '@
-            $violations = Invoke-ScriptAnalyzer -ScriptDefinition $def -IncludeRule $ruleName
+            $violations = Invoke-ScriptAnalyzer -ScriptDefinition $def -Settings $settings
         }
 
         It "Should find a violation" {