Intention action to migrate TwigExtension getFilters(), getFunctions(), and getTests() methods to use PHP attributes (#[AsTwigFilter], #[AsTwigFunction], #[AsTwigTest]).

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/php/AddRouteAttributeIntention.java

@@ -17,6 +17,7 @@
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
 import fr.adrienbrault.idea.symfony2plugin.routing.RouteHelper;
 import fr.adrienbrault.idea.symfony2plugin.util.AnnotationBackportUtil;
+import fr.adrienbrault.idea.symfony2plugin.util.CodeUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
 import icons.SymfonyIcons;
 import org.jetbrains.annotations.NotNull;
@@ -80,7 +81,7 @@ public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement
         psiDocManager.commitDocument(document);
         psiDocManager.doPostponedOperationsAndUnblockDocument(document);
 
-        reformatAddedAttribute(project, document, methodStartOffset);
+        CodeUtil.reformatAddedAttribute(project, document, methodStartOffset);
 
         // position caret after the opening quote of the path: #[Route('<caret>/...
         if (editor != null) {
@@ -89,34 +90,6 @@ public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement
         }
     }
 
-    private void reformatAddedAttribute(@NotNull Project project, @NotNull Document document, int attributeStartOffset) {
-        PsiDocumentManager psiDocManager = PsiDocumentManager.getInstance(project);
-        PsiFile freshFile = psiDocManager.getPsiFile(document);
-        if (freshFile == null) {
-            return;
-        }
-
-        PsiElement elementAtOffset = freshFile.findElementAt(attributeStartOffset);
-        if (elementAtOffset == null) {
-            return;
-        }
-
-        Method freshMethod = PsiTreeUtil.getParentOfType(elementAtOffset, Method.class);
-        if (freshMethod == null) {
-            return;
-        }
-
-        PsiElement nameIdentifier = freshMethod.getNameIdentifier();
-        if (nameIdentifier == null) {
-            return;
-        }
-
-        int endOffset = nameIdentifier.getTextRange().getEndOffset();
-
-        CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(project);
-        codeStyleManager.reformatRange(freshFile, attributeStartOffset, endOffset);
-    }
-
     @Override
     public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull PsiElement psiElement) {
         if (!Symfony2ProjectComponent.isEnabled(project)) {

src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/php/CommandToInvokableIntention.java

@@ -14,6 +14,7 @@
 import com.intellij.util.IncorrectOperationException;
 import com.jetbrains.php.lang.psi.elements.*;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
+import fr.adrienbrault.idea.symfony2plugin.util.CodeUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.PsiElementUtils;
 import icons.SymfonyIcons;
@@ -74,61 +75,8 @@ private void removeCommandExtends(@NotNull PhpClass phpClass) {
             return;
         }
 
-        // Navigate the PSI tree to find the extends clause
-        var extendsList = phpClass.getExtendsList();
-
-        List<ClassReference> references = extendsList.getReferenceElements();
-        if (references.isEmpty()) {
-            return;
-        }
-
-        // Find the Command reference
-        ClassReference commandRef = null;
-        for (ClassReference classRef : references) {
-            PhpClass resolvedClass = (PhpClass) classRef.resolve();
-            if (resolvedClass != null && "\\Symfony\\Component\\Console\\Command\\Command".equals(resolvedClass.getFQN())) {
-                commandRef = classRef;
-                break;
-            }
-        }
-
-        if (commandRef == null) {
-            return;
-        }
-
-        // If this is the only extends, remove the entire extends clause using Document API
-        // This avoids PSI null issues by editing at the text level
-        if (references.size() == 1) {
-            // Find whitespace before the extends list - we want to delete from there
-            // to include any spaces between the class name and "extends"
-            PsiElement startElement = extendsList;
-            PsiElement prev = extendsList.getPrevSibling();
-
-            // Skip backwards through whitespace to find the actual start
-            while (prev != null && (prev.getText().trim().isEmpty() || "extends".equals(prev.getText().trim()))) {
-                startElement = prev;
-                prev = prev.getPrevSibling();
-            }
-
-            // Use Document API to delete the text range
-            PsiFile file = phpClass.getContainingFile();
-            Document document = PsiDocumentManager.getInstance(phpClass.getProject()).getDocument(file);
-
-            if (document != null) {
-                int startOffset = startElement.getTextRange().getStartOffset();
-                int endOffset = extendsList.getTextRange().getEndOffset();
-
-                document.deleteString(startOffset, endOffset);
-
-                // Commit and synchronize PSI
-                PsiDocumentManager psiDocManager = PsiDocumentManager.getInstance(phpClass.getProject());
-                psiDocManager.commitDocument(document);
-                psiDocManager.doPostponedOperationsAndUnblockDocument(document);
-            }
-        } else {
-            // Multiple extends, just remove this one reference (PSI deletion is safe here)
-            commandRef.delete();
-        }
+        // Use shared utility method to remove the extends clause
+        CodeUtil.removeExtendsClause(phpClass, "\\Symfony\\Component\\Console\\Command\\Command");
     }
 
     private void optimizeImports(@NotNull PsiFile file) {