Merge pull request #512 from PowerShell/kapilmb/newline-after-close-brace

Add option to place new line after close brace

Author: daviwil

package.json

@@ -359,6 +359,11 @@
           "default": true,
           "description": "A new line must follow an open brace."
         },
+        "powershell.codeFormatting.newLineAfterCloseBrace": {
+          "type": "boolean",
+          "default": true,
+          "description": "A new line must follow a close brace."
+        },
         "powershell.codeFormatting.whitespaceBeforeOpenBrace": {
           "type": "boolean",
           "default": true,

src/features/DocumentFormatter.ts

@@ -414,6 +414,7 @@ class PSDocumentFormattingEditProvider implements
 
             case "PSPlaceCloseBrace":
                 ruleSettings["IgnoreOneLineBlock"] = psSettings.codeFormatting.ignoreOneLineBlock;
+                ruleSettings["NewLineAfter"] = psSettings.codeFormatting.newLineAfterCloseBrace;
                 break;
 
             case "PSUseConsistentIndentation":

src/settings.ts

@@ -9,6 +9,7 @@ import vscode = require('vscode');
 export interface ICodeFormattingSettings {
     openBraceOnSameLine: boolean;
     newLineAfterOpenBrace: boolean;
+    newLineAfterCloseBrace: boolean;
     whitespaceBeforeOpenBrace: boolean;
     whitespaceBeforeOpenParen: boolean;
     whitespaceAroundOperator: boolean;
@@ -56,6 +57,7 @@ export function load(myPluginId: string): ISettings {
     let defaultCodeFormattingSettings: ICodeFormattingSettings = {
         openBraceOnSameLine: true,
         newLineAfterOpenBrace: true,
+        newLineAfterCloseBrace: true,
         whitespaceBeforeOpenBrace: true,
         whitespaceBeforeOpenParen: true,
         whitespaceAroundOperator: true,