Skip to content

Commit 948d77f

Browse files
committed
Simplify getUseIndexForUseImport using findContainingOpeningBracket()
Replaces the manual findPrevious call with an exclusion list with the existing findContainingOpeningBracket() abstraction, and simplifies the second findPrevious to skip only empty tokens.
1 parent 3a0b6e4 commit 948d77f

1 file changed

Lines changed: 5 additions & 8 deletions

File tree

VariableAnalysis/Lib/Helpers.php

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -281,17 +281,14 @@ public static function getUseIndexForUseImport(File $phpcsFile, $stackPtr)
281281
{
282282
$tokens = $phpcsFile->getTokens();
283283

284-
$nonUseTokenTypes = Tokens::$emptyTokens;
285-
$nonUseTokenTypes[] = T_VARIABLE;
286-
$nonUseTokenTypes[] = T_ELLIPSIS;
287-
$nonUseTokenTypes[] = T_COMMA;
288-
$nonUseTokenTypes[] = T_BITWISE_AND;
289-
$openParenPtr = self::getIntOrNull($phpcsFile->findPrevious($nonUseTokenTypes, $stackPtr - 1, null, true, null, true));
290-
if (! is_int($openParenPtr) || $tokens[$openParenPtr]['code'] !== T_OPEN_PARENTHESIS) {
284+
$openParenPtr = self::findContainingOpeningBracket($phpcsFile, $stackPtr);
285+
if (! is_int($openParenPtr)) {
291286
return null;
292287
}
293288

294-
$usePtr = self::getIntOrNull($phpcsFile->findPrevious(array_values($nonUseTokenTypes), $openParenPtr - 1, null, true, null, true));
289+
$usePtr = self::getIntOrNull(
290+
$phpcsFile->findPrevious(Tokens::$emptyTokens, $openParenPtr - 1, null, true, null, true)
291+
);
295292
if (! is_int($usePtr) || $tokens[$usePtr]['code'] !== T_USE) {
296293
return null;
297294
}

0 commit comments

Comments
 (0)