Skip to content

1.x: Fix wiring of WhitespaceInsideBrace and WhitespaceAroundPipe that got broken in #1024 #1142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 8, 2020
Merged

1.x: Fix wiring of WhitespaceInsideBrace and WhitespaceAroundPipe that got broken in #1024 #1142

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
aeff3f0
Fix PipelineIndentation configuration issue (#1050)
bergmeister Oct 2, 2019
74320f7
legacy/1.x: Update minimum PSSA version to 1.18.3 (#1052)
bergmeister Oct 3, 2019
6cc518c
Merge branch 'legacy/1.x' of https://github.com/powershell/powershell…
Nov 13, 2019
ef44579
Merge branch 'legacy/1.x' of https://github.com/powershell/powershell…
Jan 3, 2020
7d630c7
Fix wiring of WhitespaceInsideBrace and WhitespaceAroundPipe
Jan 3, 2020
202b991
revert regression from master
Jan 3, 2020
75c5b5d
add trailing comma
Jan 3, 2020
a78d5df
revert PSAvoidUsingCmdletAliases change
Jan 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 39 additions & 35 deletions src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line and the line above is the essential fix

}},
{"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",
Copy link
Contributor Author

@bergmeister bergmeister Jan 3, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This entry (the removed PSAvoidUsingCmdletAliases) is actually not necessary and was removed in PR #1056 in master, hence why this change is also brought back as well as the essential required thing is ruleConfigurations.Add("PSAvoidUsingCmdletAliases", new Hashtable()); a few lines above here for the autoCorrectAliases feature to work

{ "IncludeRules", new string[] {
"PSPlaceCloseBrace",
"PSPlaceOpenBrace",
"PSUseConsistentWhitespace",
"PSUseConsistentIndentation",
"PSAlignAssignmentStatement",
}},
{
"Rules", ruleConfigurations
},
}
};
}
}
Expand Down