Merge branch 'lsp4jakarta-0.2.5' into issue_1401_v2

Author: Joseph-Bineesh

.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:

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;
     }