Skip to content

/ PSScriptAnalyzer

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 bug with PipelineIndentationStyle.None where break instead of continue statement was used #1497

Merged
merged 7 commits into from Jun 11, 2020
Merged

Fix bug with PipelineIndentationStyle.None where break instead of continue statement was used #1497

merged 7 commits into from Jun 11, 2020

Conversation

@bergmeister
Copy link
Collaborator

bergmeister commented May 13, 2020 •
edited

PR Summary

Fixes #1496

Also added another test case that would've caught it.

PR Checklist
@bergmeister
Fix bug with PipelineIndentationStyle.None where break instead of con…
Loading status checks…
a5a2e6b 
…tinue statement was used. TODO: Fix test that starts to fail because of this now
@bergmeister bergmeister self-assigned this May 13, 2020
@bergmeister
fix last failing test to make None not touch existing indendation
Loading status checks…
6d0a4d2
@bergmeister bergmeister marked this pull request as ready for review May 14, 2020
@bergmeister bergmeister requested review from rjmholt and JamesWTruher May 14, 2020
This was referenced May 21, 2020
Closed
Closed
Christoph Bergmeister added 3 commits Jun 11, 2020
Christoph Bergmeister
Merge branch 'master' of https://github.com/powershell/psscriptanalyzer…
Loading status checks…
6521ebd 
… into issue1496

# Conflicts:
#	Tests/Rules/UseConsistentIndentation.tests.ps1
Christoph Bergmeister
empty commit since Azure Pipelines did not trigger
Loading status checks…
6cf454f
Christoph Bergmeister
empty commit since Azure Pipelines did not trigger
Loading status checks…
8f6769f
@rjmholt
rjmholt approved these changes Jun 11, 2020
View changes
Rules/UseConsistentIndentation.cs Show resolved Hide resolved
Rules/UseConsistentIndentation.cs Show resolved Hide resolved
Rules/UseConsistentIndentation.cs Outdated Show resolved Hide resolved
Rules/UseConsistentIndentation.cs Show resolved Hide resolved
bergmeister and others added 2 commits Jun 11, 2020
@bergmeister @rjmholt
Apply suggestions from code review
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
82e993c 
Co-authored-by: Robert Holt <rjmholt@gmail.com>
@bergmeister
Apply suggestions from code review
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
13c5fcc
@bergmeister bergmeister merged commit 8e6182f into PowerShell:master Jun 11, 2020
3 checks passed
3 checks passed
PSScriptAnalyzer-CI #20200611.4 succeeded
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
license/cla All CLA requirements met.
Details
@rjmholt
rjmholt reviewed Jun 11, 2020
View changes
Rules/UseConsistentIndentation.cs
int searchLine;
do
{
searchLine = tokens[searchIndex].Extent.StartLineNumber;

This comment has been minimized.

Sign in to view
@rjmholt

rjmholt Jun 11, 2020 Member

Oh! My switch suggestion got lost! Ugh, too much context switching... Anyway, not an issue

This comment has been minimized.

Sign in to view
@bergmeister

bergmeister Jun 11, 2020 •
edited
Author Collaborator

I thought I addressed your comment here by not initializing it: #1497 (comment)
Or did you mean a switch around tokens[searchIndex].Kind? I don't see too much value in it tbh. Switch statements don't look that much cleaner for simple cases like that IMHO because of their ceremony that requires additional indentation layer, break statements, etc..
Otherwise we can always create a follow up PR
@bergmeister bergmeister mentioned this pull request Jul 20, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rjmholt rjmholt

@JamesWTruher JamesWTruher

Assignees

@bergmeister bergmeister

Labels
Area - Formatter Area - Rules Issue - Bug
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

PipelineIndentationStyle: Incorrect formatting when using None
2 participants
@bergmeister @rjmholt
You can’t perform that action at this time.