From bab4e1541c0e59e2a8ef4f3b5a9249b8567a0688 Mon Sep 17 00:00:00 2001
From: Michael Bessolov <michael@oroinc.com>
Date: Fri, 23 Dec 2022 18:51:43 -0800
Subject: [PATCH] OPP-67: Error in PhpStorm 2022.3 - disabled
 RequireJsComponent initialization

---
 .../javascript/RequireJsComponent.java        | 20 ++++++++++---------
 src/main/resources/META-INF/plugin.xml        |  7 ++++++-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/oroplatform/idea/oroplatform/intellij/codeAssist/javascript/RequireJsComponent.java b/src/main/java/com/oroplatform/idea/oroplatform/intellij/codeAssist/javascript/RequireJsComponent.java
index 22d44e0..ab47950 100644
--- a/src/main/java/com/oroplatform/idea/oroplatform/intellij/codeAssist/javascript/RequireJsComponent.java
+++ b/src/main/java/com/oroplatform/idea/oroplatform/intellij/codeAssist/javascript/RequireJsComponent.java
@@ -54,15 +54,17 @@ public void projectClosed() {
 
     @Override
     public void initComponent() {
-        if(ApplicationManager.getApplication().isUnitTestMode()) {
-            init();
-        } else {
-            StartupManager.getInstance(project).registerPostStartupActivity(() -> {
-                if(OroPlatformSettings.getInstance(project).isPluginEnabled()) {
-                    init();
-                }
-            });
-        }
+        // RequireJS bundle was removed in OroCommerce 4.1
+        return;
+//        if(ApplicationManager.getApplication().isUnitTestMode()) {
+//            init();
+//        } else {
+//            StartupManager.getInstance(project).registerPostStartupActivity(() -> {
+//                if(OroPlatformSettings.getInstance(project).isPluginEnabled()) {
+//                    init();
+//                }
+//            });
+//        }
     }
 
     private void init() {
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index ffa3e05..d1e4bf5 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -1,6 +1,6 @@
 <idea-plugin version="2">
     <id>com.oroplatform.idea.oroplatform</id>
-    <name>Oro PHPStorm Plugin</name>
+    <name>OroPlatform</name>
     <vendor url="https://github.com/orocrm/oro-phpstorm-plugin">Oro Inc.</vendor>
 
     <description><![CDATA[
@@ -10,6 +10,11 @@ Plugin for the PHPStorm that will help to increase the development speed on the
     ]]></description>
 
     <change-notes><![CDATA[
+<h2>2022.3</h2>
+<ul>
+  <li>Fixed compatibility with PHPStorm 2022.3</li>
+</ul>
+
 <h2>1.0.19</h2>
 <ul>
   <li>[#17] Fixed IllegalArgumentException in Twig templates used by layouts in PHPStorm 2020.3</li>