Merge remote-tracking branch 'upstream/main' into issue282_projectDet…

…ection_integrationTest

CHANGELOG.md

@@ -2,6 +2,23 @@
 
 All notable changes to the Liberty Tools extension will be documented below.
 
+## 23.0.9
+
+Version 23.0.9 of Liberty Tools for Visual Studio Code is a fix release that contains minor enhancements and fixes. Version 23.0.9 requires Visual Studio Code version 1.78+ and requires Java 17 or later.
+
+Notable changes:
+
+- Updated Liberty Config Language Server version to 2.0.1. For information regarding changes for version 2.0.1, refer to the release notes linked below:
+  - https://github.com/OpenLiberty/liberty-language-server/releases/tag/liberty-langserver-2.0.1
+  - https://github.com/OpenLiberty/liberty-language-server/releases/tag/lemminx-liberty-2.0.1
+- Bug fix for “Start in container” action not appearing when project parent folder is opened in VS Code Explorer - https://github.com/OpenLiberty/liberty-tools-vscode/issues/258
+- Bug fix for the Liberty Dashboard not refreshing project names after they are changed - https://github.com/OpenLiberty/liberty-tools-vscode/issues/177
+- Bug fix for parameter field in “Start…” command redirecting focus to the terminal - https://github.com/OpenLiberty/liberty-tools-vscode/issues/210
+- Added the build file path as a tooltip when hovering over project names in the Liberty dashboard - https://github.com/OpenLiberty/liberty-tools-vscode/issues/208
+
+See the [commit log](https://github.com/OpenLiberty/liberty-tools-vscode/compare/23.0.6...23.0.9) for the full set of changes since the previous release.
+
+
 ## 23.0.6
 
 Version 23.0.6 of Liberty Tools for Visual Studio Code contains minor enhancements and fixes. Version 23.0.6 requires Visual Studio Code version 1.78+ and requires Java 17 or later.

gulpfile.js

@@ -3,9 +3,9 @@ const download = require("gulp-download2");
 const cp = require("child_process");
 
 const libertyGroupId = "io.openliberty.tools";
-const libertyVersion = "2.0";
+const libertyVersion = "2.1.1";
 const jakartaGroupId = "org.eclipse.lsp4jakarta";
-const jakartaVersion = "0.1.1";
+const jakartaVersion = "0.2.0";
 var releaseLevel = "releases";  //"snapshots"; //snapshots or releases
 
 const libertyLemminxName = "liberty-langserver-lemminx-" + libertyVersion + "-jar-with-dependencies.jar";
@@ -86,8 +86,7 @@ const jakartaGroupIdString = "&g=" + jakartaGroupId;
 const jakartaVersionString = "&v=" + jakartaVersion;
 const jakartaClassifierString = "&c=jar-with-dependencies";
 
-// const jakartaJDTURL = eclipseRepoURL + jakartaReleaseLevelString + jakartaGroupIdString + "&a=org.eclipse.lsp4jakarta.jdt.core" + jakartaVersionString;
-const jakartaJDTURL = "https://download.eclipse.org/lsp4jakarta/releases/0.1.1/repository/plugins/org.eclipse.lsp4jakarta.jdt.core_0.1.1.20230614-1652.jar";
+const jakartaJDTURL = eclipseRepoURL + jakartaReleaseLevelString + jakartaGroupIdString + "&a=org.eclipse.lsp4jakarta.jdt.core" + jakartaVersionString;
 const jakartaLSURL = eclipseRepoURL + jakartaReleaseLevelString + jakartaGroupIdString + "&a=org.eclipse.lsp4jakarta.ls" + jakartaClassifierString + jakartaVersionString;
 
 gulp.task("downloadLSP4JakartaJars", (done) => {

package.json

@@ -2,7 +2,7 @@
 	"name": "liberty-dev-vscode-ext",
 	"displayName": "Liberty Tools",
 	"description": "Liberty Tools for Visual Studio Code",
-	"version": "23.0.7-SNAPSHOT",
+	"version": "23.0.12-SNAPSHOT",
 	"publisher": "Open-Liberty",
 	"repository": {
 		"type": "git",
@@ -50,10 +50,10 @@
 	],
 	"contributes": {
 		"javaExtensions": [
-			"./jars/org.eclipse.lsp4jakarta.jdt.core-0.1.1.jar"
+			"./jars/org.eclipse.lsp4jakarta.jdt.core-0.2.0.jar"
 		],
 		"xml.javaExtensions": [
-			"./jars/liberty-langserver-lemminx-2.0-jar-with-dependencies.jar"
+			"./jars/liberty-langserver-lemminx-2.1.1-jar-with-dependencies.jar"
 		],
 		"views": {
 			"explorer": [

src/definitions/lsp4jakartaLSRequestNames.ts

@@ -9,8 +9,10 @@
  */
 
 // Jakarta Language API
+export const FILEINFO_REQUEST = "jakarta/java/fileInfo"
 export const JAVA_HOVER_REQUEST = "jakarta/java/hover";
 export const JAVA_DIAGNOSTICS_REQUEST = "jakarta/java/diagnostics";
-export const JAVA_CLASSPATH_REQUEST = "jakarta/java/classpath";
-export const JAVA_CODEACTION_REQUEST = "jakarta/java/codeaction";
-export const JAVA_CURSORCONTEXT_REQUEST = "jakarta/java/cursorcontext";
+export const JAVA_COMPLETION_REQUEST = "jakarta/java/completion";
+export const JAVA_CODEACTION_REQUEST = "jakarta/java/codeAction";
+export const JAVA_CODEACTION_RESOLVE_REQUEST = "jakarta/java/codeActionResolve";
+export const JAVA_PROJECT_LABELS_REQUEST = "jakarta/java/projectLabels";

src/extension.ts

@@ -22,8 +22,8 @@ import { prepareExecutable } from "./util/javaServerStarter";
 
 const LIBERTY_CLIENT_ID = "LANGUAGE_ID_LIBERTY";
 const JAKARTA_CLIENT_ID = "LANGUAGE_ID_JAKARTA";
-export const LIBERTY_LS_JAR = "liberty-langserver-2.0-jar-with-dependencies.jar";
-export const JAKARTA_LS_JAR = "org.eclipse.lsp4jakarta.ls-0.1.1-jar-with-dependencies.jar";
+export const LIBERTY_LS_JAR = "liberty-langserver-2.1.1-jar-with-dependencies.jar";
+export const JAKARTA_LS_JAR = "org.eclipse.lsp4jakarta.ls-0.2.0-jar-with-dependencies.jar";
 
 let libertyClient: LanguageClient;
 let jakartaClient: LanguageClient;
@@ -76,10 +76,12 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
             console.log("LSP4Jakarta is ready, binding requests...");
 
             // Delegate requests from Jakarta LS to the Jakarta JDT core
-            bindRequest(lsp4jakartaLS.JAVA_CLASSPATH_REQUEST);
+            bindRequest(lsp4jakartaLS.FILEINFO_REQUEST);
+            bindRequest(lsp4jakartaLS.JAVA_COMPLETION_REQUEST);
             bindRequest(lsp4jakartaLS.JAVA_CODEACTION_REQUEST);
+	    bindRequest(lsp4jakartaLS.JAVA_CODEACTION_RESOLVE_REQUEST);
             bindRequest(lsp4jakartaLS.JAVA_DIAGNOSTICS_REQUEST);
-            bindRequest(lsp4jakartaLS.JAVA_CURSORCONTEXT_REQUEST);
+	    bindRequest(lsp4jakartaLS.JAVA_PROJECT_LABELS_REQUEST);
 
             item.text = localize("jakarta.ls.thumbs.up");
             item.tooltip = localize("jakarta.ls.started");
@@ -211,14 +213,15 @@ function startLangServer(context: ExtensionContext, requirements: RequirementsDa
 function prepareClientOptions(Liberty_LS :boolean) {
     if (Liberty_LS) {
         return {
-            // Filter to `bootstrap.properties` and `server.env` files within `src/main/liberty/config` or `usr/servers`
+            // Filter to `*.properties` and `*.env` files, let LCLS handle filtering for default/custom configs
             documentSelector: [{ scheme: "file", 
-                                pattern: "**/{src/main/liberty/config,usr/servers/**}/{bootstrap.properties,server.env}" }],
+                                pattern: "**/{*.properties,*.env}" }],
             synchronize: {
                 configurationSection: SUPPORTED_LANGUAGE_IDS,
                 fileEvents: [
-                    workspace.createFileSystemWatcher("**/bootstrap.properties"),
-                    workspace.createFileSystemWatcher("**/server.env")
+                    workspace.createFileSystemWatcher("**/*.properties"),
+                    workspace.createFileSystemWatcher("**/*.env"),
+                    workspace.createFileSystemWatcher("**/liberty-plugin-config.xml")
                 ],
             }
         };