Merge branch 'lsp4jakarta-0.2.5-integration' into bugfix/defect-580

Author: Rejoice472

.github/workflows/build.yaml

@@ -47,7 +47,7 @@ on:
   push:
     branches: '**'
   pull_request:
-    branches: [ main ]
+    branches: [ main, lsp4jakarta-0.2.5-integration ]
 
 jobs:
   fetch_merge_commit_sha_from_lsp4ij_PR:

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 25.0.5 requires **IntelliJ IDEA 2024.2.\***, **2024.3.\***, or **2025.1.\*** and a minimum of **Java 17**.
+> Note: Version 25.0.8 requires **IntelliJ IDEA 2024.2.\***, **2024.3.\***, or **2025.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).
@@ -106,7 +106,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 25.0.5 requires **IntelliJ IDEA 2024.2.\***, **2024.3.\***, or **2025.1.\*** and a minimum of **Java 17**.
+Version 25.0.8 requires **IntelliJ IDEA 2024.2.\***, **2024.3.\***, or **2025.1.\*** and a minimum of **Java 17**.
 
 For more details, check the [user guide](docs/user-guide.md#software-requirements).
 

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.3.0'
+    id 'org.jetbrains.intellij.platform' version '2.7.2'
     id 'org.jetbrains.kotlin.jvm' version '2.0.20'
 }
 
 group 'io.openliberty.tools'
-version '25.0.5'
+version '25.0.9-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)
@@ -234,6 +234,18 @@ intellijPlatform {
             untilBuild = providers.gradleProperty("pluginUntilBuild")
         }
         changeNotes = """
+        <h2> 25.0.8 </h2>
+        <p>Version 25.0.8 of Liberty Tools for IntelliJ IDEA contains a workaroud for a bug in the IntelliJ IDEA 2025.1.x fix stream. Version 25.0.8 requires IntelliJ IDEA version 2024.2.*, 2024.3.*, or 2025.1.* and a minimum of Java 17.</p>
+        <ul>
+        <li> Workaround for NullPointerException that occurs during application startup when using Liberty Tools with a fresh installation of IntelliJ IDEA 2025.1.2 or higher in the 2025.1.x fix stream. </li>
+        <li> Liberty Tools version 25.0.8 has been tested with <a href="https://github.com/redhat-developer/lsp4ij">LSP4IJ</a> version 0.14.2.
+          <ul>
+            <li> For more information regarding tested LSP4IJ versions, refer to the table in <a href="https://github.com/OpenLiberty/liberty-tools-intellij/blob/main/docs/user-guide.md#manually-install-specific-release-of-the-lsp4ij-plugin-from-the-marketplace">this section</a> of the user guide.
+          </ul>
+        </li>
+        </ul>
+        See the <a href="https://github.com/OpenLiberty/liberty-tools-intellij/compare/25.0.5...25.0.8">commit log</a> for the full set of changes since the previous release.
+        <br>
         <h2> 25.0.5 </h2>
         <p>Version 25.0.5 of Liberty Tools for IntelliJ IDEA contains enhancements and fixes. Version 25.0.5 requires IntelliJ IDEA version 2024.2.*, 2024.3.*, or 2025.1.* and a minimum of Java 17.</p>
         Notable changes:

docs/user-guide.md

@@ -7,7 +7,10 @@ For information regarding known issues and limitations, refer to our [Common Iss
     - [Software requirements](#software-requirements)
     - [Application requirements](#application-requirements)
     - [Settings](#settings)
-- [Manually install specific release of the LSP4IJ plugin from the Marketplace](#manually-install-specific-release-of-the-lsp4ij-plugin-from-the-marketplace)
+- [LSP4IJ plugin](#lsp4ij-plugin)
+    - [LSP4IJ tested versions](#lsp4ij-tested-versions)
+    - [Manually install specific release of the LSP4IJ plugin from the Marketplace](#manually-install-specific-release-of-the-lsp4ij-plugin-from-the-marketplace)
+    - [Third party language servers](#third-party-language-servers)
 - [Open the Liberty tool window](#open-the-liberty-tool-window)
 - [Run your application on Liberty using dev mode](#run-your-application-on-liberty-using-dev-mode)
     - [Use the Liberty tool window](#use-the-liberty-tool-window)
@@ -29,7 +32,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 25.0.5 requires **IntelliJ IDEA 2024.2.\***, **2024.3.\***, or **2025.1.\*** and a minimum of **Java 17**. Liberty Tools for IntelliJ IDEA is compatible with the Community Edition of IntelliJ IDEA.
+- Version 25.0.8 requires **IntelliJ IDEA 2024.2.\***, **2024.3.\***, or **2025.1.\*** and a minimum of **Java 17**. 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/)
 
@@ -51,19 +54,23 @@ Liberty Tools for IntelliJ IDEA honors the following settings:
 #### Environment Variables:
 - The **JAVA_HOME** system environment variable in the current terminal is used when you run Liberty dev mode in any project.
 
-## Manually install specific release of the LSP4IJ plugin from the Marketplace
+## LSP4IJ plugin
+Liberty Tools for IntelliJ has an external dependency on [LSP4IJ](https://github.com/redhat-developer/lsp4ij), which is automatically installed from the JetBrains Marketplace when Liberty Tools is installed. LSP4IJ is a free and open-source IntelliJ plugin that enables Language Server Protocol (LSP) support for language server integration in IntelliJ IDEA.
 
-When installing the Liberty Tools for IntelliJ plugin, the latest version of LSP4IJ from the JetBrains marketplace will be installed by default.
-
-If you prefer to use an older version of LSP4IJ (e.g., a specific version that was tested with the Liberty Tools release you are using), you can manually downgrade it by installing the desired version as a dependency from the [JetBrains marketplace](https://plugins.jetbrains.com/plugin/23257-lsp4ij/versions).
+### LSP4IJ tested versions
 
 | Liberty Tools version | LSP4IJ version(s) tested                     |
 |-----------------------|----------------------------------------------|
 | 24.0.9                | 0.5.0, 0.6.0, 0.7.0, 0.8.1                   |
 | 24.0.12               | 0.8.1, 0.9.0, 0.10.0, 0.11.0, 0.12.0, 0.13.0 |
 | 25.0.5                | 0.13.0, 0.14.0, 0.14.2                       |
-| 25.0.8                | 0.15.0                                       |
+| 25.0.8                | 0.14.2, 0.15.0                               |
+
+### Manually install specific release of the LSP4IJ plugin from the Marketplace
+
+When installing the Liberty Tools for IntelliJ plugin, the latest version of LSP4IJ from the JetBrains marketplace will be installed by default.
 
+If you prefer to use an older version of LSP4IJ (e.g., a specific version that was tested with the Liberty Tools release you are using), you can manually downgrade it by installing the desired version as a dependency from the [JetBrains marketplace](https://plugins.jetbrains.com/plugin/23257-lsp4ij/versions).
 
 Steps to install an older version of LSP4IJ:
 1. Go to the Plugins tab in the IDE Settings and uninstall the latest version.
@@ -77,6 +84,16 @@ Steps to install an older version of LSP4IJ:
 
 5. Confirm by clicking OK, then apply the changes. If prompted, restart your IDE.
 
+### Third party language servers
+LSP4IJ includes a built-in installer that may prompt users to install additional third-party language servers. While users are free to explore and install these language servers, Liberty Tools **only supports the following officially bundled language servers**:
+
+- [Liberty Config Language Server](https://github.com/OpenLiberty/liberty-language-server)
+- [Liberty LemMinX Language Server](https://github.com/OpenLiberty/liberty-language-server)
+- [Eclipse LSP4Jakarta: Language Server for Jakarta EE](https://github.com/eclipse/lsp4jakarta)
+- [Eclipse LSP4MP: Language Server for MicroProfile](https://github.com/eclipse/lsp4mp)
+
+Third-party language servers installed via LSP4IJ are **not supported** by Liberty Tools. Any issues or unexpected behaviour resulting from such third-party tools fall outside the scope of Liberty Tools support. **The Liberty Tools team is not responsible for troubleshooting or resolving problems caused by third-party language servers.**
+
 ## Open the Liberty tool window
 Select **View > Tool Windows > Liberty**.
 

gradle.properties

@@ -1,13 +1,13 @@
 useLocal=false
-pluginSinceBuild=242
-pluginUntilBuild=251.*
+pluginSinceBuild=243
+pluginUntilBuild=252.*
 
 javaVersion=21
 
 # Target IntelliJ Community by default
 platformType=IC
-platformVersion=2024.2.5
-ideTargetVersion=2025.1
+platformVersion=2024.3.6
+ideTargetVersion=2025.2.1
 
 # Example: platformBundledPlugins = com.intellij.java
 platformBundledPlugins=com.intellij.java, org.jetbrains.idea.maven, com.intellij.gradle, org.jetbrains.plugins.terminal, com.intellij.properties
@@ -17,4 +17,4 @@ lsp4JakartaVersion=0.2.3
 lsp4mpVersion=0.13.0
 lemminxVersion=0.26.1
 lclsLemminxVersion=2.3.2
-lclsVersion=2.3.2
+lclsVersion=2.3.2

src/main/java/io/openliberty/tools/intellij/lsp4jakarta/lsp4ij/PropertiesManagerForJakarta.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2024 Red Hat, Inc.
+ * Copyright (c) 2020, 2025 Red Hat, Inc.
  * Distributed under license by Red Hat, Inc. All rights reserved.
  * This program is made available under the terms of the
  * Eclipse Public License v2.0 which accompanies this distribution,
@@ -122,19 +122,9 @@ private MicroProfileJavaCompletionParams adapt(JakartaJavaCompletionParams param
 
     private JavaCursorContextResult adapt(org.eclipse.lsp4mp.commons.JavaCursorContextResult contextResult) {
         if (contextResult != null) {
-            return new JavaCursorContextResult(adapt(contextResult.getKind()), contextResult.getPrefix());
-        }
-        return null;
-    }
-
-    private JavaCursorContextKind adapt(org.eclipse.lsp4mp.commons.JavaCursorContextKind kind) {
-        if (kind != null) {
-            // Workaround for an issue with JavaCursorContextKind.forValue().
-            // See https://github.com/OpenLiberty/liberty-tools-intellij/issues/681 for details.
-            if (kind == org.eclipse.lsp4mp.commons.JavaCursorContextKind.NONE) {
-                return JavaCursorContextKind.NONE;
-            }
-            return JavaCursorContextKind.forValue(kind.getValue());
+            var kind = contextResult.getKind();
+            if(kind != null)
+                return new JavaCursorContextResult(JavaCursorContextKind.forValue(kind.getValue()), contextResult.getPrefix());
         }
         return null;
     }

src/main/java/io/openliberty/tools/intellij/util/LibertyProjectUtil.java

@@ -34,6 +34,8 @@
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
@@ -153,7 +155,25 @@ public static ArrayList<BuildFile> getRemovableMavenBuildFiles(Project project)
      */
     public static ShellTerminalWidget getTerminalWidget(Project project, LibertyModule libertyModule, boolean createWidget,
                                                         TerminalToolWindowManager terminalToolWindowManager, ShellTerminalWidget widget) {
+        // Set Terminal engine to CLASSIC
         if (widget == null && createWidget) {
+            try {
+                Class<?> optionsProviderClass = Class.forName("org.jetbrains.plugins.terminal.TerminalOptionsProvider");
+                Object optionsProviderInstance = optionsProviderClass
+                        .getMethod("getInstance")
+                        .invoke(null);
+
+                Class<?> terminalEngineClass = Class.forName("org.jetbrains.plugins.terminal.TerminalEngine");
+                Object classicEngine = Enum.valueOf((Class<Enum>) terminalEngineClass, "CLASSIC");
+                Method setEngineMethod = optionsProviderClass
+                        .getMethod("setTerminalEngine", terminalEngineClass);
+                setEngineMethod.invoke(optionsProviderInstance, classicEngine);
+
+            } catch (ClassNotFoundException | NoSuchMethodException |
+                     IllegalAccessException | InvocationTargetException e) {
+                LOGGER.error("Failed to set TerminalEngine to CLASSIC via reflection: " + e.getMessage());
+            }
+
             // create a new terminal tab
             ShellTerminalWidget newTerminal = ShellTerminalWidget.toShellJediTermWidgetOrThrow(
                     terminalToolWindowManager.createShellWidget(project.getBasePath(), libertyModule.getName(),

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

@@ -2909,7 +2909,7 @@ public static String handleMenuBasedOnVersion(RemoteRobot remoteRobot, String me
         String menuAction2;
         if (intellijVersion.startsWith("2024.2")) {
             menuAction2 = menuAction2024_2;
-        } else if (intellijVersion.startsWith("2024.3") || intellijVersion.startsWith("2025.1")) {
+        } else if (intellijVersion.startsWith("2024.3") || intellijVersion.startsWith("2025")) {
             menuAction2 = menuAction2024_3;
         } else {
             // If the version is unsupported, throw an exception to indicate the issue.

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

@@ -174,7 +174,7 @@ public ComponentFixture getProjectViewTree(String... xpathVars) {
     public JTreeFixture getProjectViewJTree(RemoteRobot remoteRobot, String... xpathVars) {
         String visibleText = xpathVars[0];
         String intellijVersion = remoteRobot.callJs("com.intellij.openapi.application.ApplicationInfo.getInstance().getFullVersion();");
-        String className = intellijVersion.startsWith("2025.1") ? "MyProjectViewTree" : "ProjectViewTree";
+        String className = intellijVersion.startsWith("2025") ? "MyProjectViewTree" : "ProjectViewTree";
 
         return find(JTreeFixture.class,
                 byXpath("//div[@class='" + className + "' and contains(@visible_text, '" + visibleText + "')]"),

src/test/resources/ci/scripts/setup.sh

@@ -39,8 +39,8 @@ MAVEN_VERSION=3.8.6
 MAVEN_ARCHIVE_SHA512=f92dbd90060c5fd422349f844ea904a0918c9c9392f3277543ce2bfb0aab941950bb4174d9b6e2ea84cd48d2940111b83ffcc2e3acf5a5b2004277105fd22be9
 
 # Gradle version control constants.
-GRADLE_VERSION=7.6.1
-GRADLE_ARCHIVE_SHA256=6147605a23b4eff6c334927a86ff3508cb5d6722cd624c97ded4c2e8640f1f87
+GRADLE_VERSION=8.7
+GRADLE_ARCHIVE_SHA256=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
 
 # Software install directory.
 SOFTWARE_INSTALL_DIR="${PWD}/test-tools/liberty-dev-tools"