From a5487d7104c176ae6363744a988be9c0d303319a Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Thu, 20 Dec 2018 17:55:48 +0000 Subject: [PATCH 1/5] Add powershell.codeformatting.pipelineIndentationStyle setting --- package.json | 10 ++++++++++ src/settings.ts | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/package.json b/package.json index 5153b58461..00d60ad854 100644 --- a/package.json +++ b/package.json @@ -565,6 +565,16 @@ "default": true, "description": "Adds a newline (line break) after a closing brace." }, + "powershell.codeFormatting.pipelineIndentationStyle": { + "type": "string", + "enum": [ + "IncreaseIndentationForFirstPipeline", + "IncreaseIndentationAfterEveryPipeline", + "NoIndentation" + ], + "default": "IncreaseIndentationForFirstPipeline", + "description": "Multi-line pipeline style settings." + }, "powershell.codeFormatting.whitespaceBeforeOpenBrace": { "type": "boolean", "default": true, diff --git a/src/settings.ts b/src/settings.ts index c7a87ffef7..e8f6fc4a4f 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -14,6 +14,12 @@ enum CodeFormattingPreset { Stroustrup, } +enum PipelineIndentationStyle { + IncreaseIndentationForFirstPipeline, + IncreaseIndentationAfterEveryPipeline, + NoIndentation, +} + export enum HelpCompletion { Disabled = "Disabled", BlockComment = "BlockComment", @@ -39,6 +45,7 @@ export interface ICodeFormattingSettings { openBraceOnSameLine: boolean; newLineAfterOpenBrace: boolean; newLineAfterCloseBrace: boolean; + pipelineIndentationStyle: PipelineIndentationStyle; whitespaceBeforeOpenBrace: boolean; whitespaceBeforeOpenParen: boolean; whitespaceAroundOperator: boolean; @@ -125,6 +132,7 @@ export function load(): ISettings { openBraceOnSameLine: true, newLineAfterOpenBrace: true, newLineAfterCloseBrace: true, + pipelineIndentationStyle: PipelineIndentationStyle.IncreaseIndentationForFirstPipeline, whitespaceBeforeOpenBrace: true, whitespaceBeforeOpenParen: true, whitespaceAroundOperator: true, From 3a89de66ad8e5987f3512f6991b445fb7d3a2296 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Tue, 8 Jan 2019 22:56:08 +0000 Subject: [PATCH 2/5] add UseCorrectCasing --- package.json | 5 +++++ src/settings.ts | 2 ++ 2 files changed, 7 insertions(+) diff --git a/package.json b/package.json index 876e413ac5..0955c9a068 100644 --- a/package.json +++ b/package.json @@ -631,6 +631,11 @@ "default": true, "description": "Align assignment statements in a hashtable or a DSC Configuration." }, + "powershell.codeFormatting.useCorrectCasing": { + "type": "boolean", + "default": true, + "description": "Correct casing of cmdlets." + }, "powershell.integratedConsole.showOnStartup": { "type": "boolean", "default": true, diff --git a/src/settings.ts b/src/settings.ts index e8f6fc4a4f..1597189190 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -52,6 +52,7 @@ export interface ICodeFormattingSettings { whitespaceAfterSeparator: boolean; ignoreOneLineBlock: boolean; alignPropertyValuePairs: boolean; + useCorrectCasing: boolean; } export interface IScriptAnalysisSettings { @@ -139,6 +140,7 @@ export function load(): ISettings { whitespaceAfterSeparator: true, ignoreOneLineBlock: true, alignPropertyValuePairs: true, + useCorrectCasing: true }; const defaultIntegratedConsoleSettings: IIntegratedConsoleSettings = { From 33537536ec435f6058cd688ebccfdf4a02be4ef3 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Tue, 8 Jan 2019 23:01:37 +0000 Subject: [PATCH 3/5] Revert "Add powershell.codeformatting.pipelineIndentationStyle setting" This reverts commit a5487d7104c176ae6363744a988be9c0d303319a. --- package.json | 10 ---------- src/settings.ts | 8 -------- 2 files changed, 18 deletions(-) diff --git a/package.json b/package.json index 0955c9a068..72b61189ba 100644 --- a/package.json +++ b/package.json @@ -591,16 +591,6 @@ "default": true, "description": "Adds a newline (line break) after a closing brace." }, - "powershell.codeFormatting.pipelineIndentationStyle": { - "type": "string", - "enum": [ - "IncreaseIndentationForFirstPipeline", - "IncreaseIndentationAfterEveryPipeline", - "NoIndentation" - ], - "default": "IncreaseIndentationForFirstPipeline", - "description": "Multi-line pipeline style settings." - }, "powershell.codeFormatting.whitespaceBeforeOpenBrace": { "type": "boolean", "default": true, diff --git a/src/settings.ts b/src/settings.ts index 1597189190..665ab3a536 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -14,12 +14,6 @@ enum CodeFormattingPreset { Stroustrup, } -enum PipelineIndentationStyle { - IncreaseIndentationForFirstPipeline, - IncreaseIndentationAfterEveryPipeline, - NoIndentation, -} - export enum HelpCompletion { Disabled = "Disabled", BlockComment = "BlockComment", @@ -45,7 +39,6 @@ export interface ICodeFormattingSettings { openBraceOnSameLine: boolean; newLineAfterOpenBrace: boolean; newLineAfterCloseBrace: boolean; - pipelineIndentationStyle: PipelineIndentationStyle; whitespaceBeforeOpenBrace: boolean; whitespaceBeforeOpenParen: boolean; whitespaceAroundOperator: boolean; @@ -133,7 +126,6 @@ export function load(): ISettings { openBraceOnSameLine: true, newLineAfterOpenBrace: true, newLineAfterCloseBrace: true, - pipelineIndentationStyle: PipelineIndentationStyle.IncreaseIndentationForFirstPipeline, whitespaceBeforeOpenBrace: true, whitespaceBeforeOpenParen: true, whitespaceAroundOperator: true, From 88c3968a917aa3d90145720f2b7a7ba81064b99a Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Tue, 8 Jan 2019 23:11:07 +0000 Subject: [PATCH 4/5] fix comma --- src/settings.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings.ts b/src/settings.ts index 665ab3a536..fac23777cb 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -132,7 +132,7 @@ export function load(): ISettings { whitespaceAfterSeparator: true, ignoreOneLineBlock: true, alignPropertyValuePairs: true, - useCorrectCasing: true + useCorrectCasing: true, }; const defaultIntegratedConsoleSettings: IIntegratedConsoleSettings = { From 5fea89e76316afcda769b2cac91382be92f994d5 Mon Sep 17 00:00:00 2001 From: "Christoph Bergmeister [MVP]" Date: Wed, 6 Mar 2019 05:20:56 +0000 Subject: [PATCH 5/5] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 72b61189ba..fa77a0aa7f 100644 --- a/package.json +++ b/package.json @@ -624,7 +624,7 @@ "powershell.codeFormatting.useCorrectCasing": { "type": "boolean", "default": true, - "description": "Correct casing of cmdlets." + "description": "Use correct casing for cmdlets." }, "powershell.integratedConsole.showOnStartup": { "type": "boolean",