From c4e52ab5687b08f671c4f091a0443df04764baaf Mon Sep 17 00:00:00 2001 From: "Christoph Bergmeister [MVP]" Date: Wed, 20 Mar 2019 13:54:53 -0700 Subject: [PATCH 1/3] add PipelineIndentationStyle mapping (#836) --- .../Server/LanguageServerSettings.cs | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs b/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs index cee52d904..8a47d5996 100644 --- a/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs +++ b/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs @@ -141,6 +141,27 @@ public enum CodeFormattingPreset Stroustrup } + /// + /// Multi-line pipeline style settings. + /// + public enum PipelineIndentationStyle + { + /// + /// After the indentation level only once after the first pipeline and keep this level for the following pipelines. + /// + IncreaseIndentationForFirstPipeline, + + /// + /// After every pipeline, keep increasing the indentation. + /// + IncreaseIndentationAfterEveryPipeline, + + /// + /// Do not increase indentation level at all after pipeline. + /// + NoIndentation + } + public class CodeFormattingSettings { /// @@ -172,6 +193,7 @@ public CodeFormattingSettings(CodeFormattingSettings codeFormattingSettings) public bool OpenBraceOnSameLine { get; set; } public bool NewLineAfterOpenBrace { get; set; } public bool NewLineAfterCloseBrace { get; set; } + public PipelineIndentationStyle PipelineIndentationStyle { get; set; } public bool WhitespaceBeforeOpenBrace { get; set; } public bool WhitespaceBeforeOpenParen { get; set; } public bool WhitespaceAroundOperator { get; set; } @@ -247,6 +269,7 @@ private Hashtable GetCustomPSSASettingsHashtable(int tabSize, bool insertSpaces) {"PSUseConsistentIndentation", new Hashtable { {"Enable", true}, {"IndentationSize", tabSize}, + {"PipelineIndentation", PipelineIndentationStyle }, {"Kind", insertSpaces ? "space" : "tab"} }}, {"PSUseConsistentWhitespace", new Hashtable { From 94078908027681353b9eb0c2fbe4c42410d4dd5f Mon Sep 17 00:00:00 2001 From: "Christoph Bergmeister [MVP]" Date: Wed, 20 Mar 2019 13:53:43 -0700 Subject: [PATCH 2/3] add UseCorrectCasing (#845) --- .../Server/LanguageServerSettings.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs b/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs index 8a47d5996..c226a8430 100644 --- a/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs +++ b/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs @@ -200,6 +200,7 @@ public CodeFormattingSettings(CodeFormattingSettings codeFormattingSettings) public bool WhitespaceAfterSeparator { get; set; } public bool IgnoreOneLineBlock { get; set; } public bool AlignPropertyValuePairs { get; set; } + public bool UseCorrectCasing { get; set; } /// @@ -283,6 +284,9 @@ private Hashtable GetCustomPSSASettingsHashtable(int tabSize, bool insertSpaces) {"Enable", true}, {"CheckHashtable", AlignPropertyValuePairs} }}, + {"PSUseCorrectCasing", new Hashtable { + {"Enable", true} + }}, }} }; } From 78d3d7306590dfafcee9e86e3680a400e9453d19 Mon Sep 17 00:00:00 2001 From: Tyler James Leonhardt Date: Wed, 20 Mar 2019 13:54:18 -0700 Subject: [PATCH 3/3] Mao new powershell.codeformatting settings WhitespaceInsideBrace and WhitespaceAroundPipe to PSSA settings hash table (#835) --- .../Server/LanguageServerSettings.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs b/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs index c226a8430..7426b7a61 100644 --- a/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs +++ b/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs @@ -198,6 +198,8 @@ public CodeFormattingSettings(CodeFormattingSettings codeFormattingSettings) public bool WhitespaceBeforeOpenParen { get; set; } public bool WhitespaceAroundOperator { get; set; } public bool WhitespaceAfterSeparator { get; set; } + public bool WhitespaceInsideBrace { get; set; } + public bool WhitespaceAroundPipe { get; set; } public bool IgnoreOneLineBlock { get; set; } public bool AlignPropertyValuePairs { get; set; } public bool UseCorrectCasing { get; set; } @@ -278,7 +280,9 @@ private Hashtable GetCustomPSSASettingsHashtable(int tabSize, bool insertSpaces) {"CheckOpenBrace", WhitespaceBeforeOpenBrace}, {"CheckOpenParen", WhitespaceBeforeOpenParen}, {"CheckOperator", WhitespaceAroundOperator}, - {"CheckSeparator", WhitespaceAfterSeparator} + {"CheckSeparator", WhitespaceAfterSeparator}, + {"CheckInnerBrace", WhitespaceInsideBrace}, + {"CheckPipe", WhitespaceAroundPipe}, }}, {"PSAlignAssignmentStatement", new Hashtable { {"Enable", true},