PHP: Support variadic marked variables in PHPDoc#9487
Open
matthiasblaesing wants to merge 2 commits into
Open
Conversation
Variadic variables (...$variable) were not correctly parsed by the PHPDoc parser. The issue manifests like this: - variadic variables in PHPDoc are not highlighted by usage marker - renaming does not work for variadic marked variables Closes: apache#9437
matthiasblaesing
added
PHP
Contributor
Author
|
@junichi11 @tmysik it would be great if you could have a look. |
tmysik
reviewed
Jul 7, 2026
| ArrayList<String> types = new ArrayList<>(); | ||
| if (tokens.length > 0 && (isReturnTag(tagType) || !tokens[0].startsWith("$"))) { //NOI18N | ||
| if (tokens.length > 0 && (isReturnTag(tagType) | ||
| || !(tokens[0].startsWith("$") /* variable */ || tokens[0].startsWith("...$") /* variadic variable */ ))) { //NOI18N |
Member
There was a problem hiding this comment.
Just braninstorming - would it make sense to have a utility method to detect "special" variables? I mean this tokens[0].charAt(0) == '$' || tokens[0].startsWith("...$"), we repeat it several times here.
Contributor
Author
|
@tmysik thanks. I added a commit that consolidates the tests into a single method. I think it improves readability. |
tmysik
reviewed
Jul 7, 2026
| ArrayList<String> types = new ArrayList<>(); | ||
| if (tokens.length > 0 && (isReturnTag(tagType) | ||
| || !(tokens[0].startsWith("$") /* variable */ || tokens[0].startsWith("...$") /* variadic variable */ ))) { //NOI18N | ||
| if (tokens.length > 0 && (isReturnTag(tagType) || !isVariableName(tokens[0]))) { //NOI18N |
Member
There was a problem hiding this comment.
Nitpick: //NOI18N can be removed.
tmysik
reviewed
Jul 7, 2026
| return variable; | ||
| } | ||
|
|
||
| public static boolean isVariableName(String token) { |
Member
There was a problem hiding this comment.
Nitpick: do we need //NOI18N to be used in this method?
Member
|
@matthiasblaesing looks better to me now, thank you! |
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
2 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.
Variadic variables (...$variable) were not correctly parsed by the PHPDoc parser. The issue manifests like this:
Closes: #9437