PSR2/SwitchDeclaration: bug fix when determining terminating statement #3551
Conversation
This file contains 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
Trailing comments within control structures nested within a switch case would break the determination of whether or not there is a terminating statement within the nested control structure. Making the `findNestedTerminator()` method look for non-empty instead of non-whitespace tokens fixes that and shouldn't break the `TerminatingComment` check as that has it's own check whether the last token in the case statement is a comment. Includes unit tests. Fixes 3550
|
I've tested this with a number of variations on my original test case, and it works perfectly. Many thanks for the speedy patch! |
|
@zorac Thanks for testing & confirming the fix! |
|
Thanks for the fix |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Trailing comments within control structures nested within a switch case would break the determination of whether or not there is a terminating statement within the nested control structure.
Making the
findNestedTerminator()method look for non-empty instead of non-whitespace tokens fixes that and shouldn't break theTerminatingCommentcheck as that has it's own check whether the last token in the case statement is a comment.Includes unit tests.
Fixes #3550