From 8e15ead683d0890cf9bff91faabb499a949f1fac Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Thu, 30 Apr 2020 20:42:24 +0100 Subject: [PATCH 1/6] PSSA 1.19.0 settings support --- .../Services/Workspace/LanguageServerSettings.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/PowerShellEditorServices/Services/Workspace/LanguageServerSettings.cs b/src/PowerShellEditorServices/Services/Workspace/LanguageServerSettings.cs index e2c9dab70..d75e8b329 100644 --- a/src/PowerShellEditorServices/Services/Workspace/LanguageServerSettings.cs +++ b/src/PowerShellEditorServices/Services/Workspace/LanguageServerSettings.cs @@ -206,18 +206,20 @@ public CodeFormattingSettings(CodeFormattingSettings codeFormattingSettings) } } + public bool AddWhitespaceAroundPipe { get; set; } public bool AutoCorrectAliases { get; set; } public CodeFormattingPreset Preset { get; set; } public bool OpenBraceOnSameLine { get; set; } public bool NewLineAfterOpenBrace { get; set; } public bool NewLineAfterCloseBrace { get; set; } public PipelineIndentationStyle PipelineIndentationStyle { get; set; } + public bool TrimWhitespaceAroundPipe { get; set; } public bool WhitespaceBeforeOpenBrace { get; set; } public bool WhitespaceBeforeOpenParen { get; set; } public bool WhitespaceAroundOperator { get; set; } public bool WhitespaceAfterSeparator { get; set; } + public bool WhitespaceBetweenParameters { 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; } @@ -294,7 +296,9 @@ private Hashtable GetCustomPSSASettingsHashtable(int tabSize, bool insertSpaces) { "CheckOperator", WhitespaceAroundOperator }, { "CheckSeparator", WhitespaceAfterSeparator }, { "CheckInnerBrace", WhitespaceInsideBrace }, - { "CheckPipe", WhitespaceAroundPipe }, + { "CheckParameter", WhitespaceBetweenParameters }, + { "CheckPipe", AddWhitespaceAroundPipe }, + { "CheckPipe", TrimWhitespaceAroundPipe }, }}, { "PSAlignAssignmentStatement", new Hashtable { { "Enable", true }, From 229f0b6da5e08eb060a1ba816b46f023d67628f8 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Thu, 30 Apr 2020 21:23:46 +0100 Subject: [PATCH 2/6] fix pssa wiring --- .../Services/Workspace/LanguageServerSettings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PowerShellEditorServices/Services/Workspace/LanguageServerSettings.cs b/src/PowerShellEditorServices/Services/Workspace/LanguageServerSettings.cs index d75e8b329..7d4e7833c 100644 --- a/src/PowerShellEditorServices/Services/Workspace/LanguageServerSettings.cs +++ b/src/PowerShellEditorServices/Services/Workspace/LanguageServerSettings.cs @@ -298,7 +298,7 @@ private Hashtable GetCustomPSSASettingsHashtable(int tabSize, bool insertSpaces) { "CheckInnerBrace", WhitespaceInsideBrace }, { "CheckParameter", WhitespaceBetweenParameters }, { "CheckPipe", AddWhitespaceAroundPipe }, - { "CheckPipe", TrimWhitespaceAroundPipe }, + { "CheckPipeForRedundantWhitespace ", TrimWhitespaceAroundPipe }, }}, { "PSAlignAssignmentStatement", new Hashtable { { "Enable", true }, From 57648d39113c915ffd7ffd95800b2013f2ffe20d Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Thu, 30 Apr 2020 22:30:12 +0100 Subject: [PATCH 3/6] remove trailing whitespace --- .../Services/Workspace/LanguageServerSettings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PowerShellEditorServices/Services/Workspace/LanguageServerSettings.cs b/src/PowerShellEditorServices/Services/Workspace/LanguageServerSettings.cs index 7d4e7833c..af3c4a1b2 100644 --- a/src/PowerShellEditorServices/Services/Workspace/LanguageServerSettings.cs +++ b/src/PowerShellEditorServices/Services/Workspace/LanguageServerSettings.cs @@ -298,7 +298,7 @@ private Hashtable GetCustomPSSASettingsHashtable(int tabSize, bool insertSpaces) { "CheckInnerBrace", WhitespaceInsideBrace }, { "CheckParameter", WhitespaceBetweenParameters }, { "CheckPipe", AddWhitespaceAroundPipe }, - { "CheckPipeForRedundantWhitespace ", TrimWhitespaceAroundPipe }, + { "CheckPipeForRedundantWhitespace", TrimWhitespaceAroundPipe }, }}, { "PSAlignAssignmentStatement", new Hashtable { { "Enable", true }, From 2ff1300de08adaf45f7acdd53fc4e252c6dc273f Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Thu, 30 Apr 2020 22:41:11 +0100 Subject: [PATCH 4/6] define None option for PipelineIndentationStyle --- .../Services/Workspace/LanguageServerSettings.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/PowerShellEditorServices/Services/Workspace/LanguageServerSettings.cs b/src/PowerShellEditorServices/Services/Workspace/LanguageServerSettings.cs index af3c4a1b2..705c79866 100644 --- a/src/PowerShellEditorServices/Services/Workspace/LanguageServerSettings.cs +++ b/src/PowerShellEditorServices/Services/Workspace/LanguageServerSettings.cs @@ -177,7 +177,12 @@ internal enum PipelineIndentationStyle /// /// Do not increase indentation level at all after pipeline. /// - NoIndentation + NoIndentation, + + /// + /// Do not change pipeline indentation level at all. + /// + None, } internal class CodeFormattingSettings From bedad5c0823197efb00c1d973e8f56e731cf3d97 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Thu, 30 Apr 2020 23:04:24 +0100 Subject: [PATCH 5/6] set pssa version to 1.19.0 --- modules.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.json b/modules.json index 01a3d3967..2aa3c8157 100644 --- a/modules.json +++ b/modules.json @@ -1,6 +1,6 @@ { "PSScriptAnalyzer":{ - "MinimumVersion":"1.18.3", + "MinimumVersion":"1.19.0", "MaximumVersion":"1.99" }, "Plaster":{ From edfff3fc14d3caaaab61195d7cc3149bcd5c3192 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Mon, 4 May 2020 20:31:08 +0100 Subject: [PATCH 6/6] re-trigger CI because PSSA 1.19.0 has released