Merge pull request #580 from magento/576-Java.lang.IllegalArgumentException_During_adding_a_new_method_into_an_existing_plugin

Fixed `Java.lang.IllegalArgumentException` During adding a new method…

Author: eduard13

CHANGELOG.md

@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 ### Fixed
 
 - New entity layout name and edit entity layout name inside it
+- `Java.lang.IllegalArgumentException` During adding a new method into an existing plugin
 
 ## 3.2.1
 

resources/META-INF/pluginIcon.svg

@@ -44,7 +44,6 @@
 import gnu.trove.THashSet;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
@@ -318,18 +317,27 @@ public static Collection<PhpNamedElementNode> fixOrderToBeAsOriginalFiles(
             final PhpNamedElementNode... selected
     ) {
         final List<PhpNamedElementNode> newSelected = ContainerUtil.newArrayList(selected);
-        Collections.sort(newSelected, (o1, o2) -> {
+        newSelected.sort((o1, o2) -> {
             final PsiElement psiElement = o1.getPsiElement();
             final PsiElement psiElement2 = o2.getPsiElement();
             final PsiFile containingFile = psiElement.getContainingFile();
             final PsiFile containingFile2 = psiElement2.getContainingFile();
             return containingFile.equals(containingFile2)
-                    ? psiElement.getTextOffset() - psiElement2.getTextOffset()
-                    : containingFile.getName().compareTo(containingFile2.getName());
+                ? psiElement.getTextOffset() - psiElement2.getTextOffset()
+                : getDocumentPosition(containingFile, containingFile2);
         });
         return newSelected;
     }
 
+    private static int getDocumentPosition(
+            final PsiFile containingFile,
+            final PsiFile containingFile2
+    ) {
+        return containingFile.getVirtualFile().getPresentableUrl().compareTo(
+            containingFile2.getVirtualFile().getPresentableUrl()
+        );
+    }
+
     private static int getSuitableEditorPosition(final Editor editor, final PhpFile phpFile) {
         final PsiElement currElement = phpFile.findElementAt(editor.getCaretModel().getOffset());
         if (currElement != null) {
@@ -371,9 +379,9 @@ private static boolean isClassMember(final PsiElement element) {
             return false;
         }
         final IElementType elementType = element.getNode().getElementType();
-        return elementType == PhpElementTypes.CLASS_FIELDS
-                    || elementType == PhpElementTypes.CLASS_CONSTANTS
-                    || elementType == PhpStubElementTypes.CLASS_METHOD;
+        return elementType.equals(PhpElementTypes.CLASS_FIELDS)
+                    || elementType.equals(PhpElementTypes.CLASS_CONSTANTS)
+                    || elementType.equals(PhpStubElementTypes.CLASS_METHOD);
     }
 
     private static int getNextPos(final PsiElement element) {