[AutoImport] Re-enable keep comment before multiple \@ (#5282)

rectorphp · Nov 23, 2023 · 72c0216 · 72c0216
1 parent 06eb108
commit 72c0216
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/packages/BetterPhpDocParser/PhpDocParser/DoctrineAnnotationDecorator.php b/packages/BetterPhpDocParser/PhpDocParser/DoctrineAnnotationDecorator.php
@@ -165,11 +165,16 @@ private function processTextSpacelessInTextNode(
             return;
         }
 
-        // temporary restore keep comment feature to avoid error
-        // in nested annotation
-        // @see https://github.com/rectorphp/rector-src/pull/5280#pullrequestreview-1745794426
-        unset($phpDocNode->children[$key]);
-        array_splice($phpDocNode->children, $key, 0, $spacelessPhpDocTagNodes);
+        $texts = explode("\n@\\", $phpDocTextNode->text);
+        $otherText = $texts[0];
+
+        if (! str_starts_with($otherText, '@\\') && trim($otherText) !== '') {
+            $phpDocNode->children[$key] = new PhpDocTextNode($otherText);
+            array_splice($phpDocNode->children, $key + 1, 0, $spacelessPhpDocTagNodes);
+        } else {
+            unset($phpDocNode->children[$key]);
+            array_splice($phpDocNode->children, $key, 0, $spacelessPhpDocTagNodes);
+        }
     }
 
     private function transformGenericTagValueNodesToDoctrineAnnotationTagValueNodes(

diff --git a/tests/Issues/AutoImport/Fixture/DocBlock/two_routes_with_comment_before.php.inc b/tests/Issues/AutoImport/Fixture/DocBlock/two_routes_with_comment_before.php.inc
@@ -26,6 +26,7 @@ use Symfony\Component\Routing\Annotation\Route;
 class TwoRoutesWithCommentBefore
 {
     /**
+     * Testsssssssssss
      * @Route("/first", methods={"GET"})
      * @Route("/second", methods={"GET"})
      */