Skip to content

legacy/1.x: Fix 'git cherry-pick' merge error causing pipelineIndentationStyle setting to not be correctly wired up - #1050

Merged
Rob Holt (rjmholt) merged 1 commit into
PowerShell:legacy/1.xfrom
bergmeister:fixMergeError
Oct 2, 2019
Merged

Rob Holt (rjmholt) merged 1 commit into
PowerShell:legacy/1.xfrom
bergmeister:fixMergeError

Conversation

@bergmeister

@bergmeister Christoph Bergmeister (bergmeister) commented Oct 2, 2019 •

Copy link
Copy Markdown
Contributor

Fixes PowerShell/vscode-powershell#2214

The backport PR #1024 did a correct cherry-pick but git did not merge the code change correctly and undid a line that was added in an earlier PR.

Locally verified.

@TylerLeonhardt TylerLeonhardt left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@MarkKharitonov

Copy link
Copy Markdown

When is it going to be released?

Copy link
Copy Markdown
Member

Likely early next week.

TylerLeonhardt pushed a commit that referenced this pull request Nov 15, 2019
…fault set of PSSA rules (#1102)

* Fix PipelineIndentation configuration issue (#1050)

* legacy/1.x: Update minimum PSSA version to 1.18.3 (#1052)

* Backport of #1101: Add PSAvoidAssignmentToAutomaticVariable to the default set of PSSA rules
@agressiv

agressiv commented Dec 5, 2019

Copy link
Copy Markdown

It's been over a month, this whitespace before/after brace problem is still there - any update when this will make it live?

@TylerLeonhardt

Copy link
Copy Markdown
Member

Apologies for the delay. There's one more PR we're trying to get in before we do the releases. It should happen in the next couple weeks.

TylerLeonhardt pushed a commit that referenced this pull request Jan 8, 2020
…t got broken in #1024 (#1142)

* Fix PipelineIndentation configuration issue (#1050)

* legacy/1.x: Update minimum PSSA version to 1.18.3 (#1052)

* Fix wiring of WhitespaceInsideBrace and WhitespaceAroundPipe

* revert regression from master

* add trailing comma

* revert PSAvoidUsingCmdletAliases change
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants