Backport #1023 and #1021 (#1024)

* Add AutoCorrectAliases setting (PR to be made in VS-Code repo as well) to add support for optionally correcting aliases as well (added in PSSA 1.18.2) (#1021) * Update PSSA version
PowerShell · Sep 17, 2019 · 4710355 · 4710355
1 parent fbecd3f
commit 4710355
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 37 deletions.
diff --git a/modules.json b/modules.json
@@ -1,6 +1,6 @@
 {
     "PSScriptAnalyzer":{
-        "MinimumVersion":"1.6",
+        "MinimumVersion":"1.18.2",
         "MaximumVersion":"1.99",
         "AllowPrerelease":false
     },

diff --git a/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs b/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs
@@ -189,6 +189,7 @@ public CodeFormattingSettings(CodeFormattingSettings codeFormattingSettings)
             }
         }
 
+        public bool AutoCorrectAliases { get; set; }
         public CodeFormattingPreset Preset { get; set; }
         public bool OpenBraceOnSameLine { get; set; }
         public bool NewLineAfterOpenBrace { get; set; }
@@ -248,50 +249,57 @@ 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}
+                }},
+                {"PSPlaceCloseBrace", new Hashtable {
+                    {"Enable", true},
+                    {"NewLineAfter", NewLineAfterCloseBrace},
+                    {"IgnoreOneLineBlock", IgnoreOneLineBlock}
+                }},
+                {"PSUseConsistentIndentation", new Hashtable {
+                    {"Enable", true},
+                    {"IndentationSize", tabSize},
+                    {"Kind", insertSpaces ? "space" : "tab"}
+                }},
+                {"PSUseConsistentWhitespace", new Hashtable {
+                    {"Enable", true},
+                    {"CheckOpenBrace", WhitespaceBeforeOpenBrace},
+                    {"CheckOpenParen", WhitespaceBeforeOpenParen},
+                    {"CheckOperator", WhitespaceAroundOperator},
+                    {"CheckSeparator", WhitespaceAfterSeparator}
+                }},
+                {"PSAlignAssignmentStatement", new Hashtable {
+                    {"Enable", true},
+                    {"CheckHashtable", AlignPropertyValuePairs}
+                }},
+                {"PSUseCorrectCasing", new Hashtable {
+                    {"Enable", UseCorrectCasing}
+                }},
+            };
+
+            if (AutoCorrectAliases)
+            {
+                ruleConfigurations.Add("PSAvoidUsingCmdletAliases", new Hashtable());
+            }
+
             return new Hashtable
             {
                 {"IncludeRules", new string[] {
                      "PSPlaceCloseBrace",
                      "PSPlaceOpenBrace",
                      "PSUseConsistentWhitespace",
                      "PSUseConsistentIndentation",
-                     "PSAlignAssignmentStatement"
+                     "PSAlignAssignmentStatement",
+                     "PSAvoidUsingCmdletAliases",
                 }},
-                {"Rules", new Hashtable {
-                    {"PSPlaceOpenBrace", new Hashtable {
-                        {"Enable", true},
-                        {"OnSameLine", OpenBraceOnSameLine},
-                        {"NewLineAfter", NewLineAfterOpenBrace},
-                        {"IgnoreOneLineBlock", IgnoreOneLineBlock}
-                    }},
-                    {"PSPlaceCloseBrace", new Hashtable {
-                        {"Enable", true},
-                        {"NewLineAfter", NewLineAfterCloseBrace},
-                        {"IgnoreOneLineBlock", IgnoreOneLineBlock}
-                    }},
-                    {"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},
-                        {"CheckInnerBrace", WhitespaceInsideBrace},
-                        {"CheckPipe", WhitespaceAroundPipe},
-                    }},
-                    {"PSAlignAssignmentStatement", new Hashtable {
-                        {"Enable", true},
-                        {"CheckHashtable", AlignPropertyValuePairs}
-                    }},
-                    {"PSUseCorrectCasing", new Hashtable {
-                        {"Enable", UseCorrectCasing}
-                    }},
-                }}
+                {
+                    "Rules", ruleConfigurations
+                },
             };
         }
     }