Fix edge case of PSUseConsistentIndentation for non-default value (IncreaseIndentationForFirstPipeline/IncreaseIndentationAfterEveryPipeline) - #1423
Merged
Christoph Bergmeister (bergmeister) merged 5 commits intoApr 4, 2020
Conversation
Copy link
Copy Markdown
Collaborator
Sorry, something went wrong.
Christoph Bergmeister (bergmeister)
requested review from
James Truher (JamesWTruher) and
Rob Holt (rjmholt)
March 2, 2020 13:04
James Truher (JamesWTruher)
approved these changes
Mar 4, 2020
James Truher (JamesWTruher)
left a comment
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
this looks fine
Sorry, something went wrong.
Comment thread
Tests/Rules/UseConsistentIndentation.tests.ps1
Outdated
| DiagnosticRecord = $violations[0] | ||
| CorrectionsCount = 1 | ||
| ViolationText = "baz" | ||
| CorrectionText = (New-Object -TypeName String -ArgumentList $indentationUnit, ($indentationSize * 1)) + 'baz' |
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
this could also be written without using New-Object:
CorrectionText = ($indentationUnit * $indentationSize) + 'baz'it's sort of a toss up as to which one is more readable
Sorry, something went wrong.
Copy link
Copy Markdown
Collaborator
Author
There was a problem hiding this comment.
Good idea, thanks, I applied it, I could even remove the parenthesis because multiplication takes precedence over addition
Sorry, something went wrong.
Comment thread
Rules/UseConsistentIndentation.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Reviewers
2 more reviewers3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR Summary
Fixes #1406
The code assumed that the first pipe in a pipeline Ast is the last one on that line, which made the code not work in the following scenario (where it did not add the indentation in the 2nd line)
Therefore add code to be able to determine the last pipe on the line were the first pipe occurs
cc Felix Becker (@felixfbecker)
PR Checklist