From aeff3f0e91cf849f5602822e327a392e4d245c2c Mon Sep 17 00:00:00 2001 From: "Christoph Bergmeister [MVP]" Date: Thu, 3 Oct 2019 00:23:16 +0100 Subject: [PATCH 1/6] Fix PipelineIndentation configuration issue (#1050) --- .../Server/LanguageServerSettings.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs b/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs index 6106fb25c..2c1d0b7df 100644 --- a/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs +++ b/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs @@ -264,6 +264,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 74320f7c2242f3f565602fa7e54d1bb7d712197d Mon Sep 17 00:00:00 2001 From: "Christoph Bergmeister [MVP]" Date: Thu, 3 Oct 2019 21:00:17 +0100 Subject: [PATCH 2/6] legacy/1.x: Update minimum PSSA version to 1.18.3 (#1052) --- modules.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.json b/modules.json index 8777ca207..df8ff6935 100644 --- a/modules.json +++ b/modules.json @@ -1,6 +1,6 @@ { "PSScriptAnalyzer":{ - "MinimumVersion":"1.18.2", + "MinimumVersion":"1.18.3", "MaximumVersion":"1.99", "AllowPrerelease":false }, From 7d630c70e0e9d91b5e949754c2c118d9c62ce13d Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Fri, 3 Jan 2020 17:00:00 +0000 Subject: [PATCH 3/6] Fix wiring of WhitespaceInsideBrace and WhitespaceAroundPipe --- .../Server/LanguageServerSettings.cs | 74 ++++++++++--------- 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs b/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs index 2c1d0b7df..720c9c3de 100644 --- a/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs +++ b/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs @@ -249,58 +249,62 @@ public Hashtable GetPSSASettingsHashtable( private Hashtable GetCustomPSSASettingsHashtable(int tabSize, bool insertSpaces) { - var ruleConfigurations = new Hashtable { - {"PSPlaceOpenBrace", new Hashtable { - {"Enable", true}, - {"OnSameLine", OpenBraceOnSameLine}, - {"NewLineAfter", NewLineAfterOpenBrace}, - {"IgnoreOneLineBlock", IgnoreOneLineBlock} + var ruleConfigurations = new Hashtable + { + { "PSPlaceOpenBrace", new Hashtable { + { "Enable", true }, + { "OnSameLine", OpenBraceOnSameLine }, + { "NewLineAfter", NewLineAfterOpenBrace }, + { "IgnoreOneLineBlock", IgnoreOneLineBlock } }}, - {"PSPlaceCloseBrace", new Hashtable { - {"Enable", true}, - {"NewLineAfter", NewLineAfterCloseBrace}, - {"IgnoreOneLineBlock", IgnoreOneLineBlock} + { "PSPlaceCloseBrace", new Hashtable { + { "Enable", true }, + { "NewLineAfter", NewLineAfterCloseBrace }, + { "IgnoreOneLineBlock", IgnoreOneLineBlock } }}, - {"PSUseConsistentIndentation", new Hashtable { - {"Enable", true}, - {"IndentationSize", tabSize}, - {"PipelineIndentation", PipelineIndentationStyle }, - {"Kind", insertSpaces ? "space" : "tab"} + { "PSUseConsistentIndentation", new Hashtable { + { "Enable", true }, + { "IndentationSize", tabSize }, + { "PipelineIndentation", PipelineIndentationStyle }, + { "Kind", insertSpaces ? "space" : "tab" } }}, - {"PSUseConsistentWhitespace", new Hashtable { - {"Enable", true}, - {"CheckOpenBrace", WhitespaceBeforeOpenBrace}, - {"CheckOpenParen", WhitespaceBeforeOpenParen}, - {"CheckOperator", WhitespaceAroundOperator}, - {"CheckSeparator", WhitespaceAfterSeparator} + { "PSUseConsistentWhitespace", new Hashtable { + { "Enable", true }, + { "CheckOpenBrace", WhitespaceBeforeOpenBrace }, + { "CheckOpenParen", WhitespaceBeforeOpenParen }, + { "CheckOperator", WhitespaceAroundOperator }, + { "CheckSeparator", WhitespaceAfterSeparator }, + { "CheckInnerBrace", WhitespaceInsideBrace }, + { "CheckPipe", WhitespaceAroundPipe }, }}, - {"PSAlignAssignmentStatement", new Hashtable { - {"Enable", true}, - {"CheckHashtable", AlignPropertyValuePairs} + { "PSAlignAssignmentStatement", new Hashtable { + { "Enable", true }, + { "CheckHashtable", AlignPropertyValuePairs } }}, - {"PSUseCorrectCasing", new Hashtable { - {"Enable", UseCorrectCasing} + { "PSUseCorrectCasing", new Hashtable { + { "Enable", UseCorrectCasing } }}, }; if (AutoCorrectAliases) { + // Empty hashtable required to activate the rule, + // since PSAvoidUsingCmdletAliases inherits from IScriptRule and not ConfigurableRule ruleConfigurations.Add("PSAvoidUsingCmdletAliases", new Hashtable()); } - return new Hashtable + return new Hashtable() { - {"IncludeRules", new string[] { - "PSPlaceCloseBrace", - "PSPlaceOpenBrace", - "PSUseConsistentWhitespace", - "PSUseConsistentIndentation", - "PSAlignAssignmentStatement", - "PSAvoidUsingCmdletAliases", + { "IncludeRules", new string[] { + "PSPlaceCloseBrace", + "PSPlaceOpenBrace", + "PSUseConsistentWhitespace", + "PSUseConsistentIndentation", + "PSAlignAssignmentStatement" }}, { "Rules", ruleConfigurations - }, + } }; } } From 202b9912f023c700dbaf92ad064e20975058d566 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Fri, 3 Jan 2020 17:12:04 +0000 Subject: [PATCH 4/6] revert regression from master --- .../Server/LanguageServerSettings.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs b/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs index 720c9c3de..1f5100463 100644 --- a/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs +++ b/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs @@ -300,7 +300,8 @@ private Hashtable GetCustomPSSASettingsHashtable(int tabSize, bool insertSpaces) "PSPlaceOpenBrace", "PSUseConsistentWhitespace", "PSUseConsistentIndentation", - "PSAlignAssignmentStatement" + "PSAlignAssignmentStatement", + "PSAvoidUsingCmdletAliases" }}, { "Rules", ruleConfigurations From 75c5b5d6d50271f23b0651bab55333b1a1575c70 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Fri, 3 Jan 2020 17:14:01 +0000 Subject: [PATCH 5/6] add trailing comma --- .../Server/LanguageServerSettings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs b/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs index 1f5100463..ad1230510 100644 --- a/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs +++ b/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs @@ -301,7 +301,7 @@ private Hashtable GetCustomPSSASettingsHashtable(int tabSize, bool insertSpaces) "PSUseConsistentWhitespace", "PSUseConsistentIndentation", "PSAlignAssignmentStatement", - "PSAvoidUsingCmdletAliases" + "PSAvoidUsingCmdletAliases", }}, { "Rules", ruleConfigurations From a78d5dfb3b7d6d7b522f4b7a42adcfee4b48df65 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Fri, 3 Jan 2020 17:52:03 +0000 Subject: [PATCH 6/6] revert PSAvoidUsingCmdletAliases change --- .../Server/LanguageServerSettings.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs b/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs index ad1230510..0b85dc3fa 100644 --- a/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs +++ b/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs @@ -301,7 +301,6 @@ private Hashtable GetCustomPSSASettingsHashtable(int tabSize, bool insertSpaces) "PSUseConsistentWhitespace", "PSUseConsistentIndentation", "PSAlignAssignmentStatement", - "PSAvoidUsingCmdletAliases", }}, { "Rules", ruleConfigurations