Fix edge case when PipelineIndentationStyle is not set to NoIndentation - #1261
Merged
Christoph Bergmeister (bergmeister) merged 3 commits intoJul 8, 2019
Conversation
Copy link
Copy Markdown
Collaborator
Sorry, something went wrong.
…aseIndentationForFirstPipeline or IncreaseIndentationAfterEveryPipeline The determination if the pipelineAst is on one line needs to be tweaked to include the case where pipelines are on the same line but a multi-line expressions follows
Christoph Bergmeister (bergmeister)
marked this pull request as ready for review
June 18, 2019 12:44
Christoph Bergmeister (bergmeister)
requested review from
James Truher (JamesWTruher) and
Rob Holt (rjmholt)
June 18, 2019 12:44
Christoph Bergmeister (bergmeister)
changed the base branch from
development
to
master
June 18, 2019 21:07
Rob Holt (rjmholt)
approved these changes
Jun 19, 2019
Rob Holt (rjmholt)
left a comment
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
Fix looks good to me
Sorry, something went wrong.
Comment thread
Rules/UseConsistentIndentation.cs
Outdated
Copy link
Copy Markdown
|
Anything blocking this? |
Sorry, something went wrong.
Copy link
Copy Markdown
Collaborator
Author
|
No, I just addressed the variable name suggestion. Sometimes I also wait a bit for James Truher (@JamesWTruher) to double check it as well. Otherwise we are good to go I think |
Sorry, something went wrong.
Copy link
Copy Markdown
|
Is 21 days enough time? :) |
Sorry, something went wrong.
James Truher (JamesWTruher)
approved these changes
Jul 8, 2019
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 reviewers4 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 #1236
Note that the originally reported issue was fixed in 1.18.1 but the issue creator posted another edge case after the release here, which is the issue that the author addresses.
When PipelineIndentationStyle is set to IncreaseIndentationForFirstPipeline or IncreaseIndentationAfterEveryPipeline:
The determination if the pipelineAst is on one line needs to be tweaked to include the case where pipelines are on the same line but a multi-line expressions follows. This lead to the next brace having one level of indentation too little.
Context: 1.18.1 fixed most PipelineIndentationStyle bugs when it is not set to NoIndentation (which is the default in VS Code at the moment), but this edge case was missed out.
Linux failure is due to the recent AppVeyor image update and affects development branch as well
PR Checklist