Added swhitching between tabs

Author: VitaliyBoyko

build.gradle.kts

@@ -40,7 +40,7 @@ dependencies {
 
     testImplementation("org.junit.vintage:junit-vintage-engine:5.10.0")
 
-    implementation("com.googlecode.json-simple:json-simple:1.1.1")
+    implementation ("org.json:json:20171018")
     implementation("org.codehaus.plexus:plexus-utils:3.4.0")
     testImplementation("com.automation-remarks:video-recorder-junit5:2.0")
     testImplementation("com.intellij.remoterobot:remote-robot:0.11.23")
@@ -53,14 +53,11 @@ dependencies {
         bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') })
         plugins(providers.gradleProperty("platformPlugins").map { it.split(',') })
         plugin("com.intellij.lang.jsgraphql", "243.21565.122")
-        instrumentationTools()
         pluginVerifier()
         zipSigner()
         testFramework(TestFrameworkType.Platform)
 
         phpstorm("2024.3")
-        bundledPlugin("com.jetbrains.php")
-        bundledPlugin("com.intellij.copyright")
     }
 }
 

gradle.properties

@@ -7,7 +7,7 @@ pluginUntilBuild = 258.*
 platformType = PS
 platformVersion = 2024.3
 platformPlugins =
-platformBundledPlugins = com.intellij.modules.json
+platformBundledPlugins = com.intellij.modules.json,com.jetbrains.php,JavaScript,com.intellij.copyright
 gradleVersion = 8.10.2
 kotlin.stdlib.default.dependency = false
 org.gradle.configuration-cache = true

gradle/libs.versions.toml

@@ -4,7 +4,7 @@ junit = "4.13.2"
 
 # plugins
 changelog = "2.2.1"
-intelliJPlatform = "2.1.0"
+intelliJPlatform = "2.4.0"
 kotlin = "1.9.25"
 kover = "0.8.3"
 qodana = "2024.2.3"

runTests.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
 ./gradlew clean
-./gradlew runIdeForUiTests &
+./gradlew runIdeForUiTests --scan &
 RUN_IDE_PID=$!
 
 sleep 10
 
-./gradlew test --no-daemon
+./gradlew test --no-daemon --scan
 
 # run certain test
 #./gradlew test --tests "com.magento.idea.magento2plugin.actions.content.MarkDirectoryAsMagentoRootTest.testMarkDirectoryAsMagentoRoot" --scan

src/main/java/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java

@@ -21,9 +21,8 @@
 import java.util.List;
 import java.util.Properties;
 import org.jetbrains.annotations.NotNull;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 public class ModuleComposerJsonGenerator extends FileGenerator {
 
@@ -176,11 +175,7 @@ private Pair<String, String> getDependencyData(
                     if (!(composerJsonFile instanceof JsonFile)) {
                         return Pair.create("", "");
                     }
-                    final JSONParser parser = new JSONParser();
-                    final Object obj = parser.parse(
-                            composerJsonFile.getText()
-                    );
-                    final JSONObject jsonObject = (JSONObject) obj;
+                    final JSONObject jsonObject = new JSONObject(composerJsonFile.getText());
 
                     if (jsonObject.get("name") == null) {
                         return Pair.create("", "");
@@ -199,7 +194,7 @@ private Pair<String, String> getDependencyData(
             } else {
                 return Pair.create("", "");
             }
-        } catch (ParseException exception) { //NOPMD
+        } catch (JSONException exception) { //NOPMD
             // It's fine
         }
 

src/main/java/com/magento/idea/magento2uct/execution/output/ReportBuilder.java

@@ -30,7 +30,7 @@
 import java.util.List;
 import java.util.Locale;
 import org.jetbrains.annotations.NotNull;
-import org.json.simple.JSONObject;
+import org.json.JSONObject;
 
 public class ReportBuilder {
 
@@ -148,9 +148,9 @@ public JsonFile build() {
                 final JsonObject issueObject = jsonElementGenerator.createObject("\"lineNumber\": "
                         + issue.getLine() + ","
                         + "\"level\": \"" + issue.getLevel() + "\","//NOPMD
-                        + "\"message\": \"" + JSONObject.escape(issue.getMessage()) + "\","
+                        + "\"message\": " + JSONObject.quote(issue.getMessage()) + ","
                         + "\"code\": \"" + issue.getCode() + "\","
-                        + "\"fileName\": \"" + JSONObject.escape(issue.getFilename()) + "\","
+                        + "\"fileName\": " + JSONObject.quote(issue.getFilename()) + ","
                         + "\"validationType\": \"" + issue.getValidationType() + "\""
                 );
                 if (issuesValueBuilder.length() > 0) {

src/test/kotlin/com/magento/idea/magento2plugin/actions/content/MarkDirectoryAsMagentoRootTest.kt

@@ -74,19 +74,16 @@ class MarkDirectoryAsMagentoRootTest  {
         startTrialFree.click()
         val dialog = find<DialogFixture>(byXpath("//div[@class='MyDialog']"))
         dialog.button("Close").click()
-
+        Thread.sleep(2_000)
         step("Switch back to PhpStorm IDE window if Firefox overlay detected") {
-            waitFor(ofMinutes(2)) {
-                remoteRobot.callJs(
+                remoteRobot.runJs(
                     """
             try {
-                const Robot = Java.type("java.awt.Robot");
                 const KeyEvent = Java.type("java.awt.event.KeyEvent");
                 const Frames = Java.type("java.awt.Frame");
-                const robot = new Robot();
-                const activeWindow = Array.from(Frames.getFrames()).find(frame => frame.isActive());
+                
+              const activeWindow = Array.from(Frames.getFrames()).find(frame => frame.isActive());
                 if (activeWindow && activeWindow.getName().includes("Firefox")) {
-                    print("Firefox overlay detected, switching to PhpStorm...");
                     robot.keyPress(KeyEvent.VK_ALT);
                     robot.keyPress(KeyEvent.VK_TAB);
                     Thread.sleep(100);
@@ -95,12 +92,11 @@ class MarkDirectoryAsMagentoRootTest  {
                 }
                 true;
             } catch (error) {
-                print("Error during script execution: " + error);
                 false;
             }
             """.trimIndent()
                 )
-            }
+
         }
         // end temporary workaround