Demo Testing

.github/workflows/build.yaml

@@ -5,7 +5,7 @@ on:
   push:
     branches: '**'
   pull_request:
-    branches: [ main, code-action-unification ]
+    branches: [ main, code-action-unification-2 ]
 
 jobs:
   build:
@@ -37,7 +37,7 @@ jobs:
         with:
           repository: MicroShed/lsp4ij
           path: lsp4ij
-          ref: refs/tags/0.0.4
+          ref: refs/tags/0.0.5
       - name: 'Checkout liberty-tools-intellij'
         uses: actions/checkout@v3
         with:

README.md

@@ -1,7 +1,7 @@
 # Liberty Tools for IntelliJ IDEA
 
 <!-- Make sure to also update the #Requirements section below, and in user-guide.md -->
-> Note: Version 24.0.3 requires **IntelliJ IDEA 2023.2.\*** or **2023.3.\*** and a minimum of **Java 17**.
+> Note: Version 24.0.6 requires **IntelliJ IDEA 2023.2.\***, **2023.3.\***, or **2024.1.\*** and a minimum of **Java 17**.
 >
 > This page provides an overview of Liberty Tools for IntelliJ IDEA.
 > For minimum requirements information and detailed instructions on how to use Liberty Tools, check the [user-guide](docs/user-guide.md).
@@ -101,7 +101,7 @@ If you experience a problem with this plugin you might be asked to collect langu
 
 ## Requirements
 <!-- Make sure to also update the note at the top of this file, and in user-guide.md -->
-Version 24.0.3 requires **IntelliJ IDEA 2023.2.\*** or **2023.3.\*** and a minimum of **Java 17**.
+Version 24.0.6 requires **IntelliJ IDEA 2023.2.\***, **2023.3.\***, or **2024.1.\*** and a minimum of **Java 17**.
 
 For more details, check the [user guide](docs/user-guide.md#software-requirements).
 

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group 'io.openliberty.tools'
-version '24.0.5-SNAPSHOT'
+version '24.0.6'
 
 sourceCompatibility = 17
 targetCompatibility = 17
@@ -48,7 +48,7 @@ repositories {
 configurations {
     lsp
     // needed to avoid ClassCastException org.apache.xerces.jaxp.DocumentBuilderFactoryImpl cannot be cast to class javax.xml.parsers.DocumentBuilderFactory
-    // xml-apis interfering with xercs
+    // xml-apis interfering with Xerces
     all*.exclude group: 'xml-apis'
 
     runtimeClasspath {
@@ -65,7 +65,7 @@ configurations {
 
 dependencies {
     implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j:0.15.0'
-    implementation 'org.microshed:lsp4ij:0.0.4' // includes org.eclipse.lsp4j
+    implementation 'org.microshed:lsp4ij:0.0.5' // includes org.eclipse.lsp4j
     implementation ('org.eclipse.lsp4mp:org.eclipse.lsp4mp.ls:0.10.0') {
         exclude group: 'org.eclipse.lsp4j'
     }
@@ -82,7 +82,7 @@ dependencies {
     }
     //required by lsp4j as the version from IJ is incompatible
 //    implementation 'com.google.code.gson:gson:2.8.9'
-//    implementation 'com.vladsch.flexmark:flexmark:0.50.50'
+//    implementation 'com.vladsch.flexmark:flexmark:0.64.8'
 //    implementation 'org.jsoup:jsoup:1.15.3'
     //Add junit dependency back when tests are added
     //testImplementation group: 'junit', name: 'junit', version: '4.13.1'
@@ -92,7 +92,7 @@ dependencies {
     testImplementation 'com.intellij.remoterobot:remote-robot:' + remoteRobotVersion
     testImplementation 'com.intellij.remoterobot:remote-fixtures:' + remoteRobotVersion
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
-    testImplementation('com.jetbrains.intellij.maven:maven-test-framework:233.11799.241') {
+    testImplementation('com.jetbrains.intellij.maven:maven-test-framework:241.15989.150') {
         transitive = false
     }
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
@@ -138,7 +138,7 @@ runIde {
 
 intellij {
     // For a full list of IntelliJ IDEA releases please see https://www.jetbrains.com/intellij-repository/releases
-    version = '2023.3.4'
+    version = '2024.1.3'
 
     plugins = ['java', 'maven', 'gradle-java', 'properties', 'terminal', 'org.jetbrains.idea.maven', 'com.intellij.gradle']
     updateSinceUntilBuild = false
@@ -180,6 +180,20 @@ tasks {
 
 patchPluginXml {
     changeNotes = """
+        <h2> 24.0.6 </h2>
+        <p>Version 24.0.6 of Liberty Tools for IntelliJ IDEA contains enhancements and fixes. Version 24.0.6 requires IntelliJ IDEA version 2023.2.*, 2023.3.*, or 2024.1.* and a minimum of Java 17.</p>
+        Notable changes:
+        <ul>
+        <li> Added support for IntelliJ IDEA 2024.1 and its successive fix releases.
+        <li> Complete quick fix support for Jakarta EE Web Profile 9.x APIs when editing Java files via the <a href="https://github.com/eclipse/lsp4jakarta">Eclipse LSP4Jakarta</a>, Language Server for Jakarta EE.
+        <li> Enabled GraphQL API support via the <a href="https://github.com/eclipse/lsp4mp">Eclipse LSP4MP</a>, Language Server for MicroProfile.
+        <li> Fix to bring into focus the terminal tab running the Liberty project targeted by a Liberty action.
+        <li> Fix to enable the removal of custom start parameters from the “Liberty: Start” action when a Liberty Run/Debug configuration is deleted.
+        <li> Updated the helper text and hover text for the “Start parameters” input box in the Liberty Run/Debug configuration editor.
+        <li> Renamed the “Liberty: View effective POM” action to “Liberty: View pom.xml”.
+        <p>Note: You may observe slow performance when editing your server.xml file when invoking completion or hover. It is possible you may receive a "No documentation found" message on hover. If observed, please report your experience on this GitHub issue: https://github.com/OpenLiberty/liberty-tools-intellij/issues/687.</p>
+        See the <a href="https://github.com/OpenLiberty/liberty-tools-intellij/compare/24.0.3...24.0.6">commit log</a> for the full set of changes since the previous release.
+        <br>
         <h2> 24.0.3 </h2>
         <p>Version 24.0.3 of Liberty Tools for IntelliJ IDEA contains enhancements and fixes. Version 24.0.3 requires IntelliJ IDEA version 2023.2.* or 2023.3.* and a minimum of Java 17.</p>
         Notable changes:

docs/user-guide.md

@@ -28,7 +28,7 @@ For information regarding known issues and limitations, refer to our [Common Iss
 ## Before you begin
 ### Software requirements
 <!-- Make sure to also update the main README.md note at its top, and its #Requirements section -->
-- Version 24.0.3 requires **IntelliJ IDEA version 2023.2.\*** or **2023.3.\***. Liberty Tools for IntelliJ IDEA is compatible with the Community Edition of IntelliJ IDEA.
+- Version 24.0.6 requires **IntelliJ IDEA 2023.2.\***, **2023.3.\***, or **2024.1.\***. Liberty Tools for IntelliJ IDEA is compatible with the Community Edition of IntelliJ IDEA.
 - **Java 17** or later. If you change the IntelliJ IDEA Boot Java Runtime through the **Change Boot Java Runtime for the IDE** preference, ensure that you are using Java 17 or later.
 - [Liberty Tools for IntelliJ IDEA plugin](https://plugins.jetbrains.com/plugin/14856-liberty-tools/)
 

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

@@ -12,11 +12,14 @@
 import com.intellij.ide.DataManager;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.actionSystem.impl.SimpleDataContext;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.fileEditor.OpenFileDescriptor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.SimpleToolWindowPanel;
+import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
 import com.intellij.ui.DoubleClickListener;
@@ -48,23 +51,39 @@ public class LibertyExplorer extends SimpleToolWindowPanel {
 
     public LibertyExplorer(@NotNull Project project) {
         super(true, true);
-        // build tree
-        Tree tree = buildTree(project, getBackground());
-
-        if (tree != null) {
-            JBScrollPane scrollPane = new JBScrollPane(tree);
-            scrollPane.setName(Constants.LIBERTY_SCROLL_PANE);
-            this.setContent(scrollPane);
-        } else {
-            JBTextArea jbTextArea = new JBTextArea(LocalizedResourceUtil.getMessage("no.liberty.projects.detected"));
-            jbTextArea.setEditable(false);
-            jbTextArea.setBackground(getBackground());
-            jbTextArea.setLineWrap(true);
-
-            this.setContent(jbTextArea);
-        }
-        ActionToolbar actionToolbar = buildActionToolbar(tree);
-        this.setToolbar(actionToolbar.getComponent());
+        //NOTE: To address the "Slow operations are prohibited on EDT" Exception (https://github.com/OpenLiberty/liberty-tools-intellij/issues/674), we have implemented the workaround outlined in the document (https://plugins.jetbrains.com/docs/intellij/general-threading-rules.html).
+        // We have now moved the method "buildTree(project, getBackground())" to a background thread. To pass control from a background thread to the Event Dispatch Thread (EDT), UI operations are now included within the method "ApplicationManager.getApplication().invokeLater()".
+        ModalityState modalityState = getModalityState();
+        ApplicationManager.getApplication().executeOnPooledThread(() -> {
+            // build tree (Read operations need to be wrapped in a read action)
+            Tree tree = ApplicationManager.getApplication().runReadAction((Computable<Tree>) () -> buildTree(project, getBackground()));
+
+            if (tree != null) {
+                ApplicationManager.getApplication().invokeLater(() -> {
+                    JBScrollPane scrollPane = new JBScrollPane(tree);
+                    scrollPane.setName(Constants.LIBERTY_SCROLL_PANE);
+                    this.setContent(scrollPane);
+                }, modalityState);
+            } else {
+                ApplicationManager.getApplication().invokeLater(() -> {
+                    JBTextArea jbTextArea = new JBTextArea(LocalizedResourceUtil.getMessage("no.liberty.projects.detected"));
+                    jbTextArea.setEditable(false);
+                    jbTextArea.setBackground(getBackground());
+                    jbTextArea.setLineWrap(true);
+
+                    this.setContent(jbTextArea);
+                }, modalityState);
+            }
+
+            ApplicationManager.getApplication().invokeLater(() -> {
+                ActionToolbar actionToolbar = buildActionToolbar(tree);
+                this.setToolbar(actionToolbar.getComponent());
+            }, modalityState);
+        });
+    }
+
+    private ModalityState getModalityState() {
+        return ModalityState.nonModal();
     }
 
     public static ActionToolbar buildActionToolbar(Tree tree) {
@@ -232,8 +251,8 @@ public void invokePopup(Component comp, int x, int y) {
                     if (node instanceof LibertyModuleNode libertyNode) {
                         final DefaultActionGroup group = new DefaultActionGroup();
                         if (libertyNode.getProjectType().equals(Constants.LIBERTY_MAVEN_PROJECT)) {
-                            AnAction viewEffectivePom = ActionManager.getInstance().getAction(Constants.VIEW_EFFECTIVE_POM_ACTION_ID);
-                            group.add(viewEffectivePom);
+                            AnAction viewPomXml = ActionManager.getInstance().getAction(Constants.VIEW_POM_XML_ACTION_ID);
+                            group.add(viewPomXml);
                             AnAction viewIntegrationReport = ActionManager.getInstance().getAction(Constants.VIEW_INTEGRATION_TEST_REPORT_ACTION_ID);
                             group.add(viewIntegrationReport);
                             AnAction viewUnitTestReport = ActionManager.getInstance().getAction(Constants.VIEW_UNIT_TEST_REPORT_ACTION_ID);

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2023 IBM Corporation.
+ * Copyright (c) 2020, 2024 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
@@ -31,11 +31,11 @@ protected String getActionCommandName() {
     protected void executeLibertyAction(LibertyModule libertyModule) {
         Project project = libertyModule.getProject();
         VirtualFile buildFile = libertyModule.getBuildFile();
-        String runTestsCommand = " ";
-        ShellTerminalWidget widget = getTerminalWidget(false, project, buildFile, getActionCommandName());
+        ShellTerminalWidget widget = getTerminalWidgetWithFocus(false, project, buildFile, getActionCommandName());
         if (widget == null) {
             return;
         }
+        String runTestsCommand = " ";
         LibertyActionUtil.executeCommand(widget, runTestsCommand);
     }
 

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2023 IBM Corporation.
+ * Copyright (c) 2020, 2024 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
@@ -76,14 +76,13 @@ protected void executeLibertyAction(LibertyModule libertyModule) {
             }
         }
 
-        ShellTerminalWidget widget = getTerminalWidget(true, project, buildFile, getActionCommandName());
+        ShellTerminalWidget widget = getTerminalWidgetWithFocus(true, project, buildFile, getActionCommandName());
         if (widget == null) {
             return;
         }
 
         String cdToProjectCmd = "cd \"" + buildFile.getParent().getPath() + "\"";
-        LibertyActionUtil.executeCommand(widget, cdToProjectCmd);
-        LibertyActionUtil.executeCommand(widget, startCmd);
+        LibertyActionUtil.executeCommand(widget, cdToProjectCmd, startCmd);
         if (libertyModule.isDebugMode() && debugPort != -1) {
             // Create remote configuration to attach debugger
             debugHandler.createAndRunDebugConfiguration(libertyModule, debugPort);

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2023 IBM Corporation.
+ * Copyright (c) 2020, 2024 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
@@ -30,7 +30,7 @@ protected String getActionCommandName() {
     protected void executeLibertyAction(LibertyModule libertyModule) {
         Project project = libertyModule.getProject();
         VirtualFile buildFile = libertyModule.getBuildFile();
-        ShellTerminalWidget widget = getTerminalWidget(true, project, buildFile, getActionCommandName());
+        ShellTerminalWidget widget = getTerminalWidgetWithFocus(true, project, buildFile, getActionCommandName());
         if (widget == null) {
             return;
         }
@@ -51,7 +51,6 @@ protected void executeLibertyAction(LibertyModule libertyModule) {
             return;
         }
         String cdToProjectCmd = "cd \"" + buildFile.getParent().getPath() + "\"";
-        LibertyActionUtil.executeCommand(widget, cdToProjectCmd);
-        LibertyActionUtil.executeCommand(widget, startCmd);
+        LibertyActionUtil.executeCommand(widget, cdToProjectCmd, startCmd);
     }
 }

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2023 IBM Corporation.
+ * Copyright (c) 2020, 2024 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
@@ -31,11 +31,11 @@ protected String getActionCommandName() {
     protected void executeLibertyAction(LibertyModule libertyModule) {
         Project project = libertyModule.getProject();
         VirtualFile buildFile = libertyModule.getBuildFile();
-        ShellTerminalWidget widget = getTerminalWidget(false, project, buildFile, getActionCommandName());
-        String stopCmd = "q";
+        ShellTerminalWidget widget = getTerminalWidgetWithFocus(false, project, buildFile, getActionCommandName());
         if (widget == null) {
             return;
         }
+        String stopCmd = "q";
         LibertyActionUtil.executeCommand(widget, stopCmd);
     }
 }

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2023 IBM Corporation.
+ * Copyright (c) 2020, 2024 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
@@ -13,6 +13,7 @@
 import com.intellij.notification.NotificationListener;
 import com.intellij.notification.NotificationType;
 import com.intellij.notification.Notifications;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.diagnostic.Logger;
@@ -26,13 +27,21 @@
 import io.openliberty.tools.intellij.util.LocalizedResourceUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.terminal.ShellTerminalWidget;
+import org.jetbrains.plugins.terminal.TerminalView;
 
 import java.util.Arrays;
 import java.util.List;
 
 public abstract class LibertyGeneralAction extends AnAction {
     protected static final Logger LOGGER = Logger.getInstance(LibertyGeneralAction.class);
 
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        // Schedule actions on the event dispatching thread.
+        // See: https://plugins.jetbrains.com/docs/intellij/basic-action-system.html#principal-implementation-overrides.
+        return ActionUpdateThread.EDT;
+    }
+
     @Override
     public void actionPerformed(@NotNull AnActionEvent e) {
         String actionCmd = getActionCommandName();
@@ -162,9 +171,16 @@ protected void notifyError(String errMsg, Project project) {
      * @param createWidget create Terminal widget if it does not already exist
      * @return ShellTerminalWidget
      */
-    protected ShellTerminalWidget getTerminalWidget(boolean createWidget, Project project, VirtualFile buildFile, String actionCmd) {
+    protected ShellTerminalWidget getTerminalWidgetWithFocus(boolean createWidget, Project project, VirtualFile buildFile, String actionCmd) {
         LibertyModule libertyModule = LibertyModules.getInstance().getLibertyModule(buildFile);
-        ShellTerminalWidget widget = LibertyProjectUtil.getTerminalWidget(project, libertyModule, createWidget);
+        TerminalView terminalView = TerminalView.getInstance(project);
+        // look for existing terminal tab
+        ShellTerminalWidget existingWidget = LibertyProjectUtil.getTerminalWidget(libertyModule, terminalView);
+        // look for creating new terminal tab
+        ShellTerminalWidget widget = LibertyProjectUtil.getTerminalWidget(project, libertyModule, createWidget, terminalView, existingWidget);
+        // Set Focus to existing terminal widget
+        LibertyProjectUtil.setFocusToWidget(project, existingWidget);
+
         // Shows error for actions where terminal widget does not exist or action requires a terminal to already exist and expects "Start" to be running
         if (widget == null || (!createWidget && !widget.hasRunningCommands())) {
             String msg;
@@ -177,8 +193,6 @@ protected ShellTerminalWidget getTerminalWidget(boolean createWidget, Project pr
             LOGGER.warn(msg);
             return null;
         }
-        widget.getComponent().setVisible(true);
-        widget.getComponent().requestFocus();
         return widget;
     }