From 2b1e42ee3e17f0d126594cd4ff0f88dd4e89639d Mon Sep 17 00:00:00 2001
From: Julien Falque <julien.falque@gmail.com>
Date: Mon, 3 May 2021 21:43:06 +0200
Subject: [PATCH] Fix group_import failing case

---
 src/Fixer/Import/GroupImportFixer.php       |  20 +--
 tests/Fixer/Import/GroupImportFixerTest.php | 183 ++++++++++++--------
 2 files changed, 113 insertions(+), 90 deletions(-)

diff --git a/src/Fixer/Import/GroupImportFixer.php b/src/Fixer/Import/GroupImportFixer.php
index 4e3ba3641d8..1e69630f137 100644
--- a/src/Fixer/Import/GroupImportFixer.php
+++ b/src/Fixer/Import/GroupImportFixer.php
@@ -144,18 +144,10 @@ private function removeSingleUseStatements(array $statements, Tokens $tokens)
     private function addGroupUseStatements(array $statements, Tokens $tokens)
     {
         $currentUseDeclaration = null;
-        $insertIndex = \array_slice($statements, -1)[0]->getEndIndex();
-
-        while ($tokens[$insertIndex]->isGivenKind([T_COMMENT, T_DOC_COMMENT])) {
-            ++$insertIndex;
-        }
+        $insertIndex = \array_slice($statements, -1)[0]->getEndIndex() + 1;
 
         foreach ($statements as $index => $useDeclaration) {
             if ($this->areDeclarationsDifferent($currentUseDeclaration, $useDeclaration)) {
-                if ($index > 1) {
-                    ++$insertIndex;
-                }
-
                 $currentUseDeclaration = $useDeclaration;
                 $insertIndex += $this->createNewGroup(
                     $tokens,
@@ -170,11 +162,11 @@ private function addGroupUseStatements(array $statements, Tokens $tokens)
                 ];
 
                 if ($useDeclaration->isAliased()) {
-                    $tokens->insertAt($insertIndex + 1, $newTokens);
+                    $tokens->insertAt($insertIndex, $newTokens);
                     $insertIndex += \count($newTokens);
                     $newTokens = [];
 
-                    $insertIndex += $this->insertToGroupUseWithAlias($tokens, $insertIndex + 1, $useDeclaration);
+                    $insertIndex += $this->insertToGroupUseWithAlias($tokens, $insertIndex, $useDeclaration);
                 }
 
                 $newTokens[] = new Token([T_STRING, $useDeclaration->getShortName()]);
@@ -185,7 +177,7 @@ private function addGroupUseStatements(array $statements, Tokens $tokens)
                     $newTokens[] = new Token([T_WHITESPACE, "\n"]);
                 }
 
-                $tokens->insertAt($insertIndex + 1, $newTokens);
+                $tokens->insertAt($insertIndex, $newTokens);
                 $insertIndex += \count($newTokens);
             }
         }
@@ -222,7 +214,7 @@ private function insertToGroupUseWithAlias(Tokens $tokens, $insertIndex, Namespa
 
         $tokens->insertAt($insertIndex, $newTokens);
 
-        return \count($newTokens);
+        return \count($newTokens) + 1;
     }
 
     /**
@@ -276,7 +268,7 @@ private function createNewGroup(Tokens $tokens, $insertIndex, NamespaceUseAnalys
             $insertIndex += $inserted;
         }
 
-        $tokens->insertAt($insertIndex + 1, new Token([T_STRING, $useDeclaration->getShortName()]));
+        $tokens->insertAt($insertIndex, new Token([T_STRING, $useDeclaration->getShortName()]));
         ++$insertedTokens;
 
         return $insertedTokens;
diff --git a/tests/Fixer/Import/GroupImportFixerTest.php b/tests/Fixer/Import/GroupImportFixerTest.php
index 48ebd058368..1fe772cc116 100644
--- a/tests/Fixer/Import/GroupImportFixerTest.php
+++ b/tests/Fixer/Import/GroupImportFixerTest.php
@@ -54,15 +54,14 @@ public function testFix($expected, $input = null)
 
     public function provideFixCases()
     {
-        $tests = [
-            [
-                '<?php
+        yield [
+            '<?php
 
 namespace Test;
 
 use Foo\{Bar, Baz, Test};
 ',
-                '<?php
+            '<?php
 
 namespace Test;
 
@@ -70,118 +69,127 @@ public function provideFixCases()
 use Foo\Baz;
 use Foo\Test;
 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
 
 use App\First;
 use Test\Second;
 use Foo\{Bar, Baz};
 ',
-                '<?php
+            '<?php
 
 use App\First;
 use Foo\Bar;
 use Test\Second;
 use Foo\Baz;
 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
 
 use App\{First, Second};
 use Foo\{Bar, Baz};
 ',
-                '<?php
+            '<?php
 
 use Foo\Bar;
 use Foo\Baz;
 use App\First;
 use App\Second;
 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
 
 use App\{First, Second};
 use Foo\{Bar, Baz};
 ',
-                '<?php
+            '<?php
 
 use Foo\Bar;
 use App\First;
 use Foo\Baz;
 use App\Second;
 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
 
 use Foo\{Bar as Test, Baz};
 use App;
 ',
-                '<?php
+            '<?php
 
 use Foo\Bar as Test;
 use Foo\Baz;
 use App;
 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
 
 use App\Repository\{Customer as Client, Profile, User};
 ',
-                '<?php
+            '<?php
 
 use App\Repository\User;
 use App\Repository\Profile;
 use App\Repository\Customer as Client;
 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
 
 use function Foo\{Bar, Baz, Test as Alias};
 ',
-                '<?php
+            '<?php
 
 use function Foo\Bar;
 use function Foo\Baz;
 use function Foo\Test as Alias;
 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
 
 use const Some\Place\{A, B, C as D};
 ',
-                '<?php
+            '<?php
 
 use const Some\Place\A;
 use const Some\Place\B;
 use const Some\Place\C as D;
 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
 use Foo\Bar;
 use Foo\Baz\Lorem\Ipsum\Lets\Write\Some\More\Strings\{One, Two};
 ',
-                '<?php
+            '<?php
 use Foo\Bar;
 use Foo\Baz\Lorem\Ipsum\Lets\Write\Some\More\Strings\One;
 use Foo\Baz\Lorem\Ipsum\Lets\Write\Some\More\Strings\Two;
 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
 use Foo\Baz\John\Smith\Junior;
 use Foo\{Bar, Baz};
 use Foo\Baz\John\{Doe, Smith};
 use Foo\Baz\Johnny\{DoeSecond, SmithSecond};
 ',
-                '<?php
+            '<?php
 use Foo\Bar;
 use Foo\Baz;
 use Foo\Baz\John\Doe;
@@ -190,67 +198,73 @@ public function provideFixCases()
 use Foo\Baz\Johnny\DoeSecond;
 use Foo\Baz\Johnny\SmithSecond;
 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
 use PhpCsFixer\Tokenizer\{AbstractTransformer, CT, Token, Tokens};
 ',
-                '<?php
+            '<?php
 use PhpCsFixer\Tokenizer\AbstractTransformer;
 use PhpCsFixer\Tokenizer\CT;
 use PhpCsFixer\Tokenizer\Token;
 use PhpCsFixer\Tokenizer\Tokens;
 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
 use Foo\{Bar, Baz};
 ',
-                '<?php
+            '<?php
 use Foo\Bar;use Foo\Baz;
 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
 use Foo\{Bar, Baz};
 \DontTouch::me();
 ',
-                '<?php
+            '<?php
 use Foo\Bar;use Foo\Baz;\DontTouch::me();
 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
 
 use Foo\{Bar, Baz};
 use ReflectionClass;
 use ReflectionMethod;
 ',
-                '<?php
+            '<?php
 
 use Foo\Bar;
 use Foo\Baz;
 use ReflectionClass;
 use ReflectionMethod;
 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
 
 use Foo\{Bar, Baz};
 use \ReflectionClass;
 use \ReflectionMethod;
 ',
-                '<?php
+            '<?php
 
 use Foo\Bar;
 use Foo\Baz;
 use \ReflectionClass;
 use \ReflectionMethod;
 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
 
 use Framework\Support\{Arr, Collection};
 use Framework\Database\ORM\{Model, SoftDeletes};
@@ -259,7 +273,7 @@ public function provideFixCases()
 use Framework\Database\ORM\Relations\{BelongsTo, HasOne};
 use Framework\Database\Query\JoinClause;
 ',
-                '<?php
+            '<?php
 
 use Framework\Database\ORM\Model;
 use Framework\Database\ORM\Relations\BelongsTo;
@@ -273,15 +287,16 @@ public function provideFixCases()
 use Framework\Support\Facades\DB;
 use Framework\Support\Facades\Log;
 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
 
 use Framework\Baz\Class6;
 use Framework\Bar\{Class3, Class4, Class5};
 use Framework\Foo\{Class1, Class2, Class7};
 ',
-                '<?php
+            '<?php
 
 use Framework\Foo\Class1;
 use Framework\Foo\Class2;
@@ -291,25 +306,41 @@ public function provideFixCases()
 use Framework\Baz\Class6;
 use Framework\Foo\Class7;
 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
 
 use function Foo\baz;
 use Foo\{Bar, Baz};
 ',
-                '<?php
+            '<?php
 
 use Foo\Bar;
 use function Foo\baz;
 use Foo\Baz;
 ',
-            ],
         ];
 
-        foreach ($tests as $index => $test) {
-            yield $index => $test;
-        }
+        yield [
+            '<?php
+
+use Foo\{D, E};
+use function Foo\{a, b};
+use Foo\Bar\Baz\{A, B};
+use Foo\Bar\C;
+',
+            '<?php
+
+use Foo\Bar\Baz\A;
+use Foo\Bar\Baz\B;
+use Foo\Bar\C;
+use Foo\D;
+use Foo\E;
+use function Foo\a;
+use function Foo\b;
+',
+        ];
 
         if (\PHP_VERSION_ID < 80000) {
             yield [