Merge remote-tracking branch 'upstream/main' into constants#1153

Author: anusreelakshmi934

.github/workflows/build.yaml

@@ -93,25 +93,61 @@ jobs:
   build:
     needs: fetch_merge_commit_sha_from_lsp4ij_PR
     runs-on: ${{ matrix.os }}
+    name: ${{ matrix.runtime }} - ${{ matrix.test-group }}
     strategy:
       fail-fast: false
       matrix:
         runtime: [ linux, mac, windows ]
+        test-group: [ LSP4Jakarta-Unit, Maven-MicroProfile, Gradle-MicroProfile, Maven-Custom-Liberty-Install, Gradle-Custom-Liberty-Install, Maven-MP-Config, Gradle-MP-Config, Maven-MP-SID, Gradle-MP-SID, Maven-NLT-REST, Gradle-NLT-REST, Gradle-Language-Server, Gradle-MP-Language-Server, Gradle-Jakarta-Language-Server, Maven-Multi-Module-MP ]
+        exclude:
+          # Exclude LSP4Jakarta-Unit from mac and windows - only run on linux
+          - runtime: mac
+            test-group: LSP4Jakarta-Unit
+          - runtime: windows
+            test-group: LSP4Jakarta-Unit
         include:
           - runtime: linux
             os: ubuntu-latest
-            reportName: linux-test-report
           - runtime: mac
-            os: macOS-latest
-            reportName: mac-test-report
+            os: macOS-14
           - runtime: windows
             os: windows-latest
-            reportName: windows-test-report
+          - test-group: Maven-MicroProfile
+            test-class: io.openliberty.tools.intellij.it.MavenSingleModMPProjectTest
+          - test-group: Gradle-MicroProfile
+            test-class: io.openliberty.tools.intellij.it.GradleSingleModMPProjectTest
+          - test-group: Maven-Custom-Liberty-Install
+            test-class: io.openliberty.tools.intellij.it.MavenSingleModCustomWLPInstallProjectTest
+          - test-group: Gradle-Custom-Liberty-Install
+            test-class: io.openliberty.tools.intellij.it.GradleSingleModCustomWLPInstallProjectTest
+          - test-group: Maven-MP-Config
+            test-class: io.openliberty.tools.intellij.it.MavenSingleModMPCfgProjectTest
+          - test-group: Gradle-MP-Config
+            test-class: io.openliberty.tools.intellij.it.GradleSingleModMPCfgProjectTest
+          - test-group: Maven-MP-SID
+            test-class: io.openliberty.tools.intellij.it.MavenSingleModMPSIDProjectTest
+          - test-group: Gradle-MP-SID
+            test-class: io.openliberty.tools.intellij.it.GradleSingleModMPSIDProjectTest
+          - test-group: Maven-NLT-REST
+            test-class: io.openliberty.tools.intellij.it.MavenSingleModNLTRestProjectTest
+          - test-group: Gradle-NLT-REST
+            test-class: io.openliberty.tools.intellij.it.GradleSingleModNLTRestProjectTest
+          - test-group: Gradle-Language-Server
+            test-class: io.openliberty.tools.intellij.it.GradleSingleModLSTest
+          - test-group: Gradle-MP-Language-Server
+            test-class: io.openliberty.tools.intellij.it.GradleSingleModMPLSTest
+          - test-group: Gradle-Jakarta-Language-Server
+            test-class: io.openliberty.tools.intellij.it.GradleSingleModJakartaLSTest
+          - test-group: Maven-Multi-Module-MP
+            test-class: io.openliberty.tools.intellij.it.MavenMPMultipleProjectTest
+          - test-group: LSP4Jakarta-Unit
+            test-class: "io.openliberty.tools.intellij.lsp4jakarta.it.*"
     env:
       USE_LOCAL_PLUGIN: ${{ inputs.useLocalPlugin || false }}
       REF_LSP4IJ: ${{ needs.fetch_merge_commit_sha_from_lsp4ij_PR.outputs.pr_details }}
       LSP4IJ_BRANCH: ${{ needs.fetch_merge_commit_sha_from_lsp4ij_PR.outputs.checkout_name }}
       REF_LTI_TAG: ${{ inputs.refLTITag }}
+      TEST_CLASS: ${{ matrix.test-class }}
     steps:
       - name: Configure pagefile
         if: contains(matrix.os, 'windows')
@@ -152,7 +188,7 @@ jobs:
         working-directory: ./liberty-tools-intellij
         run: bash ./gradlew buildPlugin -PuseLocal=${{ env.USE_LOCAL_PLUGIN }}
       - name: 'Archive artifacts'
-        if: ${{ runner.os == 'Linux' && !failure() }}
+        if: ${{ runner.os == 'Linux' && matrix.test-group == 'LSP4Jakarta-Unit' && !failure() }}
         uses: actions/[email protected]
         with:
           name: liberty-tools-intellij-LTI-${{ env.REF_LTI_TAG || 'default' }}-LSP4IJ-${{ env.LSP4IJ_BRANCH || 'default' }}
@@ -161,14 +197,14 @@ jobs:
             ./**/libs/*liberty-tools-intellij*.jar
           if-no-files-found: warn
           retention-days: 7
-      - name: 'Run UI integration tests'
+      - name: 'Run tests'
         id: run_tests
         working-directory: ./liberty-tools-intellij
         run: bash ./src/test/resources/ci/scripts/run.sh
       - name: 'Archive Test logs and reports'
         if: ${{ failure() && steps.run_tests.conclusion == 'failure' }}
         uses: actions/[email protected]
         with:
-          name: ${{ matrix.reportName }}-LTI-${{ env.REF_LTI_TAG || 'default' }}-LSP4IJ-${{ env.LSP4IJ_BRANCH || 'default' }}
+          name: ${{ matrix.runtime }}-${{ matrix.test-group }}-test-report-LTI-${{ env.REF_LTI_TAG || 'default' }}-LSP4IJ-${{ env.LSP4IJ_BRANCH || 'default' }}
           path: |
             liberty-tools-intellij/build/reports/

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,19 +1,18 @@
 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
 
 # Version numbers of dependencies
-lsp4JakartaVersion=0.2.3
+lsp4JakartaVersion=0.2.5
 lsp4mpVersion=0.13.0
 lemminxVersion=0.26.1
 lclsLemminxVersion=2.4

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/lsp4jakarta/lsp4ij/DiagnosticsUtils.java

@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 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
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package io.openliberty.tools.intellij.lsp4jakarta.lsp4ij;
+
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.*;
+import com.intellij.psi.search.GlobalSearchScope;
+
+/**
+ * Utility class for common IntelliJ PSI-based diagnostic logic.
+ */
+public class DiagnosticsUtils {
+
+    /**
+     * inheritsFrom
+     * Check if specified superType is present or not in the type hierarchy
+     *
+     * @param clazz
+     * @param fqSuperType
+     * @return
+     */
+    public static boolean inheritsFrom(PsiClass clazz, String fqSuperType) {
+        Project project = clazz.getProject();
+        PsiClass superClass = JavaPsiFacade.getInstance(project)
+                .findClass(fqSuperType, GlobalSearchScope.allScope(project));
+        return superClass != null &&
+                (clazz.isEquivalentTo(superClass) || clazz.isInheritor(superClass, true));
+    }
+}

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

@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2025 IBM Corporation and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+ * which is available at https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package io.openliberty.tools.intellij.lsp4jakarta.lsp4ij;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.intellij.psi.PsiAnnotation;
+import com.intellij.psi.PsiAnnotationMemberValue;
+import io.openliberty.tools.intellij.lsp4jakarta.lsp4ij.jsonb.JsonbConstants;
+
+
+/**
+ * Utilities for working with JSON properties and extracting/decoding values from its attribute, annotation etc.
+ */
+public class JsonPropertyUtils {
+
+    /**
+     * @param propertyName
+     * @return String
+     * @description Method decodes unicode property name value to string value
+     */
+    public static String decodeUnicodeName(String propertyName) {
+        Pattern pattern = Pattern.compile(JsonbConstants.JSONB_PROPERTYNAME_UNICODE); // Pattern for detecting unicode sequence
+        Matcher matcher = pattern.matcher(propertyName);
+        StringBuffer decoded = new StringBuffer();
+        while (matcher.find()) {
+            String unicode = matcher.group(1);
+            char decodedChar = (char) Integer.parseInt(unicode, 16);
+            matcher.appendReplacement(decoded, Character.toString(decodedChar));
+        }
+        matcher.appendTail(decoded);
+        return decoded.toString();
+    }
+
+    /**
+     * @param annotation
+     * @return String
+     * @description Method extracts property name value from the annotation
+     */
+    public static String extractPropertyNameFromJsonField(PsiAnnotation annotation) {
+        PsiAnnotationMemberValue psiValue = annotation.findAttributeValue("value");
+        String value = psiValue != null ? psiValue.getText() : null;
+        // Remove wrapping quotes if it's a string literal
+        if (value != null && value.startsWith("\"") && value.endsWith("\"")) {
+            value = value.substring(1, value.length() - 1);
+        }
+        return value;
+    }
+}

src/main/java/io/openliberty/tools/intellij/lsp4jakarta/lsp4ij/annotations/AnnotationConstants.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021, 2022 IBM Corporation and others.
+ * Copyright (c) 2021, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,4 +44,8 @@ public class AnnotationConstants {
     public static final String DIAGNOSTIC_CODE_PREDESTROY_PARAMS = "PreDestroyParams";
     public static final String DIAGNOSTIC_CODE_PREDESTROY_EXCEPTION = "PreDestroyException";
     public static final String DIAGNOSTIC_CODE_PREDESTROY_STATIC = "PreDestroyStatic";
+
+    /* Exceptions */
+    public static final String EXCEPTION = "java.lang.Exception";
+    public static final String RUNTIME_EXCEPTION = "java.lang.RuntimeException";
 }