Remove unnecessary isArrowFunction block in getScopeCloseForScopeOpen

sirbrillig · sirbrillig · commit 4cc7f350ae9d · 2026-01-25T13:01:57.000-05:00
diff --git a/VariableAnalysis/Lib/Helpers.php b/VariableAnalysis/Lib/Helpers.php
@@ -1064,12 +1064,6 @@ public static function getScopeCloseForScopeOpen(File $phpcsFile, $scopeStartInd
 	{
 		$tokens = $phpcsFile->getTokens();
 		$scopeCloserIndex = isset($tokens[$scopeStartIndex]['scope_closer']) ? $tokens[$scopeStartIndex]['scope_closer'] : 0;
-
-		if (self::isArrowFunction($phpcsFile, $scopeStartIndex)) {
-			$arrowFunctionInfo = self::getArrowFunctionOpenClose($phpcsFile, $scopeStartIndex);
-			$scopeCloserIndex = $arrowFunctionInfo ? $arrowFunctionInfo['scope_closer'] : $scopeCloserIndex;
-		}
-
 		if ($scopeStartIndex === 0) {
 			$scopeCloserIndex = self::getLastNonEmptyTokenIndexInFile($phpcsFile);
 		}

Original file line number	Diff line number	Diff line change
`@@ -1064,12 +1064,6 @@ public static function getScopeCloseForScopeOpen(File $phpcsFile, $scopeStartInd`
`1064`	`1064`	`{`
`1065`	`1065`	`$tokens = $phpcsFile->getTokens();`
`1066`	`1066`	`$scopeCloserIndex = isset($tokens[$scopeStartIndex]['scope_closer']) ? $tokens[$scopeStartIndex]['scope_closer'] : 0;`
`1067`		`-`
`1068`		`- if (self::isArrowFunction($phpcsFile, $scopeStartIndex)) {`
`1069`		`- $arrowFunctionInfo = self::getArrowFunctionOpenClose($phpcsFile, $scopeStartIndex);`
`1070`		`- $scopeCloserIndex = $arrowFunctionInfo ? $arrowFunctionInfo['scope_closer'] : $scopeCloserIndex;`
`1071`		`- }`
`1072`		`-`
`1073`	`1067`	`if ($scopeStartIndex === 0) {`
`1074`	`1068`	`$scopeCloserIndex = self::getLastNonEmptyTokenIndexInFile($phpcsFile);`
`1075`	`1069`	`}`