From 51c78ef47bc8fbe5dd1fd5927aba32b0646a1e4b Mon Sep 17 00:00:00 2001
From: Vitaliy Boyko <v.boyko@atwix.com>
Date: Mon, 26 Apr 2021 15:16:29 +0300
Subject: [PATCH] Fixed `Java.lang.IllegalArgumentException` During adding a
 new method into an existing plugin Adjusted plugin logo

---
 CHANGELOG.md                                  |  4 ++++
 resources/META-INF/pluginIcon.svg             |  8 ++++++-
 .../PluginGenerateMethodHandlerBase.java      | 22 +++++++++++++------
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e489060b..507100690 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 
 ## 3.2.2
 
+### Fixed
+
+- `Java.lang.IllegalArgumentException` During adding a new method into an existing plugin
+
 ## 3.2.1
 
 ### Fixed
diff --git a/resources/META-INF/pluginIcon.svg b/resources/META-INF/pluginIcon.svg
index a79977df8..564f534c2 100644
--- a/resources/META-INF/pluginIcon.svg
+++ b/resources/META-INF/pluginIcon.svg
@@ -1 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="45px" height="54px" viewBox="0 0 45 54" version="1.1"><title>Magento-color</title><g id="Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="Color-" transform="translate(-502.000000, -756.000000)" fill="#F37B1F"><path d="M524.486 756L502 769.845v26.308l5.84 3.496v-26.31l16.65-10.29 16.666 10.274.069.04-.008 26.247 5.783-3.457v-26.308L524.486 756zm2.976 46.957l-2.976 1.848-2.979-1.858V772.22l-7.713 4.826v26.305L524.486 810l10.782-6.695V777.03l-7.806-4.833v30.76z" id="Magento"/></g></g><metadata><rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:dc="http://purl.org/dc/elements/1.1/"><rdf:Description about="https://iconscout.com/legal#licenses" dc:title="magento,color" dc:description="magento,color" dc:publisher="Iconscout" dc:date="2017-09-14" dc:format="image/svg+xml" dc:language="en"><dc:creator><rdf:Bag><rdf:li>Alexis Doreau</rdf:li></rdf:Bag></dc:creator></rdf:Description></rdf:RDF></metadata></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<svg viewBox="0 0 240 234" xmlns="http://www.w3.org/2000/svg">
+    <rect fill="#fa0f00" height="234" rx="42.5" width="240"/>
+    <path d="m186.617 175.95037h-28.50642a6.24325 6.24325 0 0 1 -5.84652-3.76911l-30.94691-72.35915a1.36371 1.36371 0 0 0 -2.61145-.034l-19.286 45.94252a1.63479 1.63479 0 0 0 1.50656 2.26937h21.1992a3.26957 3.26957 0 0 1 3.01052 1.99409l9.2814 20.65452a3.81249 3.81249 0 0 1 -3.5078 5.30176h-77.17558a3.51828 3.51828 0 0 1 -3.2129-4.90437l49.08958-116.90224a6.639 6.639 0 0 1 6.23232-4.14376h28.31354a6.6281 6.6281 0 0 1 6.23289 4.14376l49.42942 116.90224a3.51717 3.51717 0 0 1 -3.20185 4.90437z"
+          fill="#fff"/>
+</svg>
\ No newline at end of file
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/PluginGenerateMethodHandlerBase.java b/src/com/magento/idea/magento2plugin/actions/generation/PluginGenerateMethodHandlerBase.java
index 2cb3b262d..c2fdb8ce8 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/PluginGenerateMethodHandlerBase.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/PluginGenerateMethodHandlerBase.java
@@ -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) {