Generic.WhiteSpace.ScopeIndent: Fix multi-line extends/implements indentation#1366
Open
jrchamp wants to merge 3 commits intoPHPCSStandards:4.xfrom
Open
Generic.WhiteSpace.ScopeIndent: Fix multi-line extends/implements indentation#1366jrchamp wants to merge 3 commits intoPHPCSStandards:4.xfrom
jrchamp wants to merge 3 commits intoPHPCSStandards:4.xfrom
Conversation
Add tests for anonymous classes. This required a change to the ScopeIndentSniff logic to not skip tokens when processing a multi-line anonymous class definition. Thankfully there are many test cases already to avoid regressions.
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
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.
Description
Scope indentation for multi-line declarations was not working.
extendsandimplementsare "children" of the oo scope tokens (for example, class/interface), so when they appear on a separate line, they were not being indented appropriately. Additionally, their "siblings", the name tokens were ignored or sometimes skipped completely.This PR adds tests for multi-line OO Scope Tokens, adds logic so indentation is correctly checked, and reworks the logic that was causing anonymous class tokens to be skipped.
Suggested changelog entry
Generic.WhiteSpace.ScopeIndent: Fix multi-line extends/implements indentation
Types of changes
PR checklist