Pass code formatting options to AnalysisService

Author: Kapil Borle

package.json

@@ -270,6 +270,11 @@
                     "type": "boolean",
                     "default": false,
                     "description": "Launches the language service with the /waitForDebugger flag to force it to wait for a .NET debugger to attach before proceeding."
+                },
+                "powershell.codeformatting.openBraceOnSameLine":{
+                    "type":"boolean",
+                    "default": true,
+                    "description": "Places open brace on the same line as its associated statement."
                 }
             }
         }

src/features/DocumentFormatter.ts

@@ -3,6 +3,8 @@ import { languages, TextDocument, TextEdit, FormattingOptions, CancellationToken
 import { LanguageClient, RequestType, NotificationType } from 'vscode-languageclient';
 import Window = vscode.window;
 import { IFeature } from '../feature';
+import * as Settings from '../settings';
+import * as Utils from '../utils';
 
 export namespace ScriptFileMarkersRequest {
     export const type: RequestType<any, any, void> = { get method(): string { return "powerShell/getScriptFileMarkers"; } };
@@ -12,6 +14,7 @@ export namespace ScriptFileMarkersRequest {
 interface ScriptFileMarkersRequestParams {
     filePath: string;
     rules: string[];
+    settings: string;
 }
 
 interface ScriptFileMarkersRequestResultParams {
@@ -71,11 +74,13 @@ class PSDocumentFormattingEditProvider implements vscode.DocumentFormattingEditP
         options: FormattingOptions,
         index: number): Thenable<TextEdit[]> | TextEdit[] {
         if (this.languageClient !== null && index < this.ruleOrder.length) {
+            let rule = this.ruleOrder[index];
             return this.languageClient.sendRequest(
                 ScriptFileMarkersRequest.type,
                 {
                     filePath: document.fileName,
-                    rules: [this.ruleOrder[index]]
+                    rules: [rule],
+                    settings: this.getSettings(rule)
                 })
                 .then((result: ScriptFileMarkersRequestResultParams) => {
 
@@ -130,6 +135,18 @@ class PSDocumentFormattingEditProvider implements vscode.DocumentFormattingEditP
     setLanguageClient(languageClient: LanguageClient): void {
         this.languageClient = languageClient;
     }
+
+    getSettings(rule: string): string {
+        let settings: Settings.ISettings = Settings.load(Utils.PowerShellLanguageId);
+        return `@{
+    IncludeRules = @('${rule}')
+    Rules = @{
+                PSPlaceOpenBrace = @{
+                    OnSameLine = \$${settings.codeformatting.openBraceOnSameLine}
+        }
+    }
+}`;
+    }
 }
 
 export class DocumentFormatterFeature implements IFeature {

src/settings.ts

@@ -6,6 +6,10 @@
 
 import vscode = require('vscode');
 
+export interface ICodeFormattingSettings {
+    openBraceOnSameLine: boolean;
+}
+
 export interface IScriptAnalysisSettings {
     enable?: boolean
     settingsPath: string
@@ -19,31 +23,37 @@ export interface IDeveloperSettings {
 }
 
 export interface ISettings {
-    useX86Host?: boolean,
-    enableProfileLoading?: boolean,
-    scriptAnalysis?: IScriptAnalysisSettings,
-    developer?: IDeveloperSettings,
+    useX86Host?: boolean;
+    enableProfileLoading?: boolean;
+    scriptAnalysis?: IScriptAnalysisSettings;
+    developer?: IDeveloperSettings;
+    codeformatting?: ICodeFormattingSettings;
 }
 
 export function load(myPluginId: string): ISettings {
-    let configuration = vscode.workspace.getConfiguration(myPluginId);
+    let configuration: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration(myPluginId);
 
-    let defaultScriptAnalysisSettings = {
+    let defaultScriptAnalysisSettings: IScriptAnalysisSettings = {
         enable: true,
         settingsPath: ""
     };
 
-    let defaultDeveloperSettings = {
+    let defaultDeveloperSettings: IDeveloperSettings = {
         powerShellExePath: undefined,
         bundledModulesPath: "../modules/",
         editorServicesLogLevel: "Normal",
         editorServicesWaitForDebugger: false
-    }
+    };
+
+    let defaultCodeFormattingSettings: ICodeFormattingSettings = {
+        openBraceOnSameLine: true
+    };
 
     return {
         useX86Host: configuration.get<boolean>("useX86Host", false),
         enableProfileLoading: configuration.get<boolean>("enableProfileLoading", false),
         scriptAnalysis: configuration.get<IScriptAnalysisSettings>("scriptAnalysis", defaultScriptAnalysisSettings),
-        developer: configuration.get<IDeveloperSettings>("developer", defaultDeveloperSettings)
-    }
+        developer: configuration.get<IDeveloperSettings>("developer", defaultDeveloperSettings),
+        codeformatting: configuration.get<ICodeFormattingSettings>("codeformatting", defaultCodeFormattingSettings)
+    };
 }