Fixed finding the end of a use block

Th3Mouk · Aug 29, 2019 · 0260750 · 0260750
1 parent aafc304
commit 0260750
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/src/Files/File.php b/src/Files/File.php
@@ -2343,6 +2343,11 @@ public function findEndOfStatement($start, $ignore=null)
                 && $i === $this->tokens[$i]['parenthesis_opener']
             ) {
                 $i = $this->tokens[$i]['parenthesis_closer'];
+            } else if ($this->tokens[$i]['code'] === T_OPEN_USE_GROUP) {
+                $end = $this->findNext(T_CLOSE_USE_GROUP, ($i + 1));
+                if ($end !== false) {
+                    $i = $end;
+                }
             }
 
             if (isset(Util\Tokens::$emptyTokens[$this->tokens[$i]['code']]) === false) {

diff --git a/tests/Core/File/FindEndOfStatementTest.inc b/tests/Core/File/FindEndOfStatementTest.inc
@@ -26,3 +26,6 @@ switch ($a) {
 $a = [new Datetime];
 $a = array(new Datetime);
 $a = new Datetime;
+
+/* testUseGroup */
+use Vendor\Package\{ClassA as A, ClassB, ClassC as C};
diff --git a/tests/Core/File/FindEndOfStatementTest.php b/tests/Core/File/FindEndOfStatementTest.php
@@ -156,4 +156,20 @@ public function testStatementAsArrayValue()
     }//end testStatementAsArrayValue()
 
 
+    /**
+     * Test a use group.
+     *
+     * @return void
+     */
+    public function testUseGroup()
+    {
+        $start = (self::$phpcsFile->findNext(T_COMMENT, 0, null, false, '/* testUseGroup */') + 2);
+        $found = self::$phpcsFile->findEndOfStatement($start);
+
+        $tokens = self::$phpcsFile->getTokens();
+        $this->assertSame($tokens[($start + 23)], $tokens[$found]);
+
+    }//end testUseGroup()
+
+
 }//end class