Skip to content
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.

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

Fix edge case when PipelineIndentationStyle is not set to NoIndentation #1261

Conversation

bergmeister
Copy link
Collaborator

@bergmeister bergmeister commented Jun 15, 2019

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

…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
@bergmeister bergmeister marked this pull request as ready for review June 18, 2019 12:44
@bergmeister bergmeister changed the base branch from development to master June 18, 2019 21:07
Copy link
Contributor

@rjmholt rjmholt left a comment

Choose a reason for hiding this comment

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

Fix looks good to me

Rules/UseConsistentIndentation.cs Outdated Show resolved Hide resolved
@felixfbecker
Copy link

Anything blocking this?

@bergmeister
Copy link
Collaborator Author

No, I just addressed the variable name suggestion. Sometimes I also wait a bit for @JamesWTruher to double check it as well. Otherwise we are good to go I think

@felixfbecker
Copy link

Is 21 days enough time? :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Closing brace of if block is deindented if block contains a pipe
4 participants