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":{ diff --git a/src/PowerShellEditorServices/Services/Workspace/LanguageServerSettings.cs b/src/PowerShellEditorServices/Services/Workspace/LanguageServerSettings.cs index e2c9dab70..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 @@ -206,18 +211,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 +301,9 @@ private Hashtable GetCustomPSSASettingsHashtable(int tabSize, bool insertSpaces) { "CheckOperator", WhitespaceAroundOperator }, { "CheckSeparator", WhitespaceAfterSeparator }, { "CheckInnerBrace", WhitespaceInsideBrace }, - { "CheckPipe", WhitespaceAroundPipe }, + { "CheckParameter", WhitespaceBetweenParameters }, + { "CheckPipe", AddWhitespaceAroundPipe }, + { "CheckPipeForRedundantWhitespace", TrimWhitespaceAroundPipe }, }}, { "PSAlignAssignmentStatement", new Hashtable { { "Enable", true },