Merge remote-tracking branch 'upstream/main' into clean-up-cron-job

Author: anusreelakshmi934

build.gradle

@@ -3,12 +3,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 plugins {
     id 'java'
-    id 'org.jetbrains.intellij.platform' version '2.7.2'
+    id 'org.jetbrains.intellij.platform' version '2.10.1'
     id 'org.jetbrains.kotlin.jvm' version '2.0.20'
 }
 
 group 'io.openliberty.tools'
-version '25.0.9'
+version '25.0.12-SNAPSHOT'
 
 def remoteRobotVersion = "0.11.23"
 // To switch to nightly version, append "@nightly" to the version number (i.e. 0.4.1-20240828-013108@nightly)
@@ -178,7 +178,7 @@ task copyDeps(type: Copy) {
 intellijPlatformTesting.runIde {
     runIdeLocally {
         version = providers.gradleProperty("ideTargetVersion")
-        type = IntelliJPlatformType.IntellijIdeaCommunity
+        type = IntelliJPlatformType.IntellijIdea
         task {
             jvmArgumentProviders.add({
                 [
@@ -203,7 +203,7 @@ test {
 intellijPlatformTesting.runIde {
     runIdeForUiTests {
         version = providers.gradleProperty("ideTargetVersion")
-        type = IntelliJPlatformType.IntellijIdeaCommunity
+        type = IntelliJPlatformType.IntellijIdea
         task {
             jvmArgumentProviders.add({
                 [
@@ -216,6 +216,8 @@ intellijPlatformTesting.runIde {
                         "-Dide.mac.file.chooser.native=false",
                         "-DjbScreenMenuBar.enabled=false",
                         "-Dapple.laf.useScreenMenuBar=false",
+                        // This disables the EAP login prompt:
+                        "-Deap.require.license=release"
                 ]
             } as CommandLineArgumentProvider)
             systemProperty("ide.native.launcher", "true")
@@ -231,7 +233,7 @@ intellijPlatform {
     pluginConfiguration {
         ideaVersion {
             sinceBuild = providers.gradleProperty("pluginSinceBuild")
-            untilBuild = providers.gradleProperty("pluginUntilBuild")
+            untilBuild = provider { null }
         }
         changeNotes = """
         <h2> 25.0.9 </h2>

gradle.properties

@@ -1,13 +1,12 @@
 useLocal=false
-pluginSinceBuild=243
-pluginUntilBuild=252.*
+pluginSinceBuild=251
 
 javaVersion=21
 
 # Target IntelliJ Community by default
-platformType=IC
+platformType=IU
 platformVersion=2024.3.6
-ideTargetVersion=2025.2.1
+ideTargetVersion=253.28294.251
 
 # Example: platformBundledPlugins = com.intellij.java
 platformBundledPlugins=com.intellij.java, org.jetbrains.idea.maven, com.intellij.gradle, org.jetbrains.plugins.terminal, com.intellij.properties

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/io/openliberty/tools/intellij/LibertyExplorer.java

@@ -11,6 +11,7 @@
 
 import com.intellij.ide.DataManager;
 import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.actionSystem.ex.ActionUtil;
 import com.intellij.openapi.actionSystem.impl.SimpleDataContext;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ModalityState;
@@ -284,9 +285,10 @@ private static void executeAction(Tree tree) {
             }
             LibertyGeneralAction action = (LibertyGeneralAction) am.getAction(actionId);
             if (action != null) {
-                action.actionPerformed(new AnActionEvent(DataManager.getInstance().getDataContext(tree),
+                AnActionEvent event = new AnActionEvent(DataManager.getInstance().getDataContext(tree),
                         new Presentation(), ActionPlaces.UNKNOWN, ActionUiKind.NONE, null,
-                        0, am));
+                        0, am);
+                ActionUtil.performActionDumbAwareWithCallbacks(action, event);
             }
         }
     }

src/main/java/io/openliberty/tools/intellij/actions/RunLibertyDevTask.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2024 IBM Corporation.
+ * Copyright (c) 2020, 2025 IBM Corporation.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -11,6 +11,7 @@
 
 import com.intellij.ide.DataManager;
 import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.actionSystem.ex.ActionUtil;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.wm.ToolWindow;
@@ -81,7 +82,8 @@ private void handleLibertyTreeEvent(@NotNull AnActionEvent e, Project project, b
                                 } else {
                                     // calls selected action
                                     AnAction action = ActionManager.getInstance().getAction(Constants.FULL_ACTIONS_MAP.get(lastPathComponent));
-                                    action.actionPerformed(new AnActionEvent(DataManager.getInstance().getDataContext(libertyTree), e.getPresentation(), e.getPlace(), ActionUiKind.NONE, null, 0, ActionManager.getInstance()));
+                                    AnActionEvent event = new AnActionEvent(DataManager.getInstance().getDataContext(libertyTree), e.getPresentation(), e.getPlace(), ActionUiKind.NONE, null, 0, ActionManager.getInstance());
+                                    ActionUtil.performActionDumbAwareWithCallbacks(action, event);
                                 }
                             }
                         }
@@ -117,7 +119,8 @@ public void actionPerformed(@NotNull AnActionEvent e) {
                 String selectedAction = libertyActions[ret];
                 // run selected action
                 AnAction action = ActionManager.getInstance().getAction(Constants.FULL_ACTIONS_MAP.get(selectedAction));
-                action.actionPerformed(new AnActionEvent(e.getDataContext(), e.getPresentation(), e.getPlace(), ActionUiKind.NONE, null, 0, ActionManager.getInstance()));
+                AnActionEvent event = new AnActionEvent(e.getDataContext(), e.getPresentation(), e.getPlace(), ActionUiKind.NONE, null, 0, ActionManager.getInstance());
+                ActionUtil.performActionDumbAwareWithCallbacks(action, event);
             }
         } else {
             handleLibertyTreeEvent(e, project, false);

src/main/java/io/openliberty/tools/intellij/runConfiguration/LibertyRunConfiguration.java

@@ -15,6 +15,7 @@
 import com.intellij.execution.executors.DefaultDebugExecutor;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.actionSystem.ex.ActionUtil;
 import com.intellij.openapi.actionSystem.impl.SimpleDataContext;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.module.Module;
@@ -159,7 +160,7 @@ public RunProfileState getState(@NotNull Executor executor, @NotNull ExecutionEn
                 .build();
 
         AnActionEvent event = new AnActionEvent(dataCtx, new Presentation(), ActionPlaces.UNKNOWN, ActionUiKind.NONE, null, 0, ActionManager.getInstance());
-        action.actionPerformed(event);
+        ActionUtil.performActionDumbAwareWithCallbacks(action, event);
 
         // return null because we are not plugging into "Run" tool window in IntelliJ, just terminal and Debug
         return null;

src/test/java/io/openliberty/tools/intellij/it/SingleModJakartaLSTestCommon.java

@@ -149,8 +149,8 @@ public void testJakartaDiagnosticsInJavaPart() {
     /**
      * Tests Jakarta Language Server quick fix support in a Java source file
      */
-//    @Test
-//    @Video
+    @Test
+    @Video
     public void testJakartaQuickFixInJavaPart() {
         String publicString = "public Response getProperties() {";
         String privateString = "private Response getProperties() {";

src/test/java/io/openliberty/tools/intellij/it/SingleModMPProjectCfgTestCommon.java

@@ -102,6 +102,8 @@ public void setSmMPProjectName(String name) {
     @BeforeEach
     public void beforeEach(TestInfo info) {
         TestUtils.printTrace(TestUtils.TraceSevLevel.INFO, this.getClass().getSimpleName() + "." + info.getDisplayName() + ". Entry");
+        // IntelliJ does not start building and indexing until the Project View is open
+        UIBotTestUtils.waitForIndexing(remoteRobot);
     }
 
     /**

src/test/java/io/openliberty/tools/intellij/it/UIBotTestUtils.java

@@ -744,7 +744,7 @@ public static void clickOnFileTab(RemoteRobot remoteRobot, String fileName) {
         ProjectFrameFixture projectFrame = remoteRobot.find(ProjectFrameFixture.class, Duration.ofSeconds(10));
 
         try {
-            String xPath = "//div[@accessiblename='" + fileName + "' and @class='EditorTabLabel']";
+            String xPath = "//div[starts-with(@accessiblename, '" + fileName + "') and @class='EditorTabLabel']";
             ComponentFixture actionButton = projectFrame.getActionButton(xPath, "10");
             actionButton.click();
 
@@ -780,7 +780,7 @@ public static void hoverInAppServerCfgFile(RemoteRobot remoteRobot, String hover
                 // Find the target text on the editor and move the move to it.
                 editorNew.findText(contains(hoverTarget)).moveMouse();
                 // clear and "lightbulb" icons?
-                if (!hoverFile.equals("server.xml")) {
+                if (!hoverFile.startsWith("server.xml")) {
                     keyboard.hotKey(VK_ESCAPE);
                 }
 
@@ -2069,6 +2069,11 @@ public static void createLibertyConfiguration(RemoteRobot remoteRobot, String cf
             ActionButtonFixture addCfgButton = addProjectDialog.actionButton(addButtonLocator);
             addCfgButton.click();
 
+            // Click on the Collapse All button.
+            Locator collapseButtonLocator = byXpath("//div[@accessiblename='Collapse All']");
+            ActionButtonFixture collapseButton = addProjectDialog.actionButton(collapseButtonLocator);
+            collapseButton.click();
+
             // Look for the Liberty entry in the Add New configuration window and  create a new configuration.
             ComponentFixture pluginCfgTree = addProjectDialog.getMyTree();
             RepeatUtilsKt.waitFor(Duration.ofSeconds(10),
@@ -2400,7 +2405,7 @@ public static void selectConfigUsingMenu(RemoteRobot remoteRobot, String cfgName
     public static void runConfigUsingIconOnToolbar(RemoteRobot remoteRobot, ExecMode execMode) {
         ProjectFrameFixture projectFrame = remoteRobot.find(ProjectFrameFixture.class, Duration.ofSeconds(10));
 
-        Locator locator = byXpath("//div[@class='ActionButton' and @myaction='Run (Run selected configuration)']");
+        Locator locator = byXpath("//div[@class='ActionButton' and @myaction='Run (Run the selected configuration)']");
         if (execMode == ExecMode.DEBUG) {
             locator = byXpath("//div[@class='ActionButton' and @myicon='debug.svg']");
         }

src/test/java/io/openliberty/tools/intellij/it/fixtures/ProjectFrameFixture.java

@@ -251,7 +251,7 @@ public static void clickMenuOption(ProjectFrameFixture projectFrame, String text
     public ComponentFixture getInplaceButton(String... xpathVars) {
         String name = xpathVars[0];
         String waitTime = xpathVars[1];
-        Locator locator = byXpath("//div[@accessiblename='" + name + "' and @class='EditorTabLabel']//div[@class='InplaceButton']");
+        Locator locator = byXpath("//div[starts-with(@accessiblename, '" + name + "') and @class='EditorTabLabel']//div[@class='InplaceButton']");
         return find(ComponentFixture.class, locator, Duration.ofSeconds(Integer.parseInt(waitTime)));
     }