From d1fbb5e3c51b28dd1ac5ad2680ee795d22a49bb2 Mon Sep 17 00:00:00 2001 From: David Mueller <48686014+dmuelle@users.noreply.github.com> Date: Tue, 6 Jun 2023 10:32:33 -0400 Subject: [PATCH 01/25] Update en.json per ID review --- src/locales/en.json | 72 ++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 3375e38f..95612366 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -4,60 +4,60 @@ "liberty.ls.thumbs.up": "Liberty LS $(thumbsup)", "liberty.ls.thumbs.down": "Liberty LS $(thumbsdown)", "liberty.ls.starting": "Language Server for Liberty is starting...", - "liberty.ls.started": "Language Server for Liberty started", - "liberty.ls.failstart": "Language Server for Liberty failed to start", + "liberty.ls.started": "Language Server for Liberty started.", + "liberty.ls.failstart": "Language Server for Liberty failed to start.", "jakarta.ls": "LSP4Jakarta", "jakarta.ls.output.dropdown": "Language Support for Jakarta EE", "jakarta.ls.thumbs.up": "LSP4Jakarta $(thumbsup)", - "jakarta.ls.started": "Language Server for Jakarta started", + "jakarta.ls.started": "Language Server for Jakarta started.", "no.liberty.projects.found": "No liberty projects found.", - "starting.liberty.dev.on": "Starting liberty dev on {0}", - "cannot.start.liberty.dev": "Cannot start liberty dev on an undefined project", - "stopping.liverty.dev.on": "Stopping liberty dev on {0}", - "liberty.dev.not.started.on": "liberty dev has not been started on {0}", - "cannot.stop.liberty.dev.on.undefined": "Cannot stop liberty dev on an undefined project", + "starting.liberty.dev.on": "Starting liberty dev on {0}.", + "cannot.start.liberty.dev": "Cannot start liberty dev on an undefined project.", + "stopping.liverty.dev.on": "Stopping liberty dev on {0}.", + "liberty.dev.not.started.on": "liberty dev did not start on {0}.", + "cannot.stop.liberty.dev.on.undefined": "Cannot stop liberty dev on an undefined project.", "params.must.start.with.dash": "Parameters must start with -", - "starting.liberty.dev.with.custom.param": "Starting liberty dev with custom parameters on {0}", + "starting.liberty.dev.with.custom.param": "Starting liberty dev with custom parameters on {0}.", "specify.custom.parms.maven": "Specify custom parameters for 'mvn liberty:dev' command.", "specify.custom.parms.gradle": "Specify custom parameters for 'gradle libertyDev' command.", - "cannot.custom.start.liberty.dev": "Cannot custom start liberty dev on an undefined project", - "cannot.start.liberty.dev.in.container.on.undefined.project": "Cannot start liberty dev in a container on an undefined project", - "running.liberty.dev.tests.on": "Running liberty dev tests on {0}", - "liberty.dev.has.not.been.started.on": "liberty dev has not been started on {0}", - "cannot.run.test.on.undefined.project": "Cannot run tests on an undefined project", + "cannot.custom.start.liberty.dev": "Cannot custom start liberty dev on an undefined project.", + "cannot.start.liberty.dev.in.container.on.undefined.project": "Cannot start liberty dev in a container on an undefined project.", + "running.liberty.dev.tests.on": "Running liberty dev tests on {0}.", + "liberty.dev.has.not.been.started.on": "liberty dev did not start on {0}.", + "cannot.run.test.on.undefined.project": "Cannot run tests on an undefined project.", "test.report.does.not.exist.run.test.first": "Test report ({0}) does not exist. Run tests to generate a test report.", - "cannot.open.test.reports.on.undefined.project": "Cannot open test reports on an undefined project", - "unable.to.delete.terminal": "Unable to delete terminal: {0}", - "unable.to.parse.settings.gradle": "Unable to parse settings.gradle: {0}. The error is: {1}", - "unable.to.parse.build.gradle": "Unable to parse build.gradle: {0}. The error is {1}", - "error.parsing.pom": "Unable to parse pom file, the error is {0}", + "cannot.open.test.reports.on.undefined.project": "Cannot open test reports on an undefined project.", + "unable.to.delete.terminal": "Unable to delete terminal: {0}.", + "unable.to.parse.settings.gradle": "Unable to parse settings.gradle: {0}. The error is: {1}.", + "unable.to.parse.build.gradle": "Unable to parse build.gradle: {0}. The error is {1}.", + "error.parsing.pom": "Unable to parse pom file. The error is {0}.", "refreshing.liberty.dashboard": "Refreshing Liberty Dashboard projects...", - "no.liberty.project.found.in.empty.workspace": "No Liberty project found in empty workspace", - "add.project.manually.no.projects.available.to.add": "No workspace folders available to be added to Liberty Dashboard", - "add.project.manually.message.0": "The selected project at {0} has been successfully added to Liberty Dashboard", - "add.project.manually.message.1": "The selected project at {0} already exists in Liberty Dashboard", - "add.project.manually.message.2": "The selected project at {0} is not a Maven or Gradle project", + "no.liberty.project.found.in.empty.workspace": "No Liberty project was found in empty workspace.", + "add.project.manually.no.projects.available.to.add": "No workspace folders are available to be added to Liberty Dashboard.", + "add.project.manually.message.0": "The selected project at {0} is added to the Liberty Dashboard.", + "add.project.manually.message.1": "The selected project at {0} already exists in the Liberty Dashboard.", + "add.project.manually.message.2": "The selected project at {0} is not a Maven or Gradle project.", "confirmation.button.label.yes": "Yes", "confirmation.button.label.no": "No", "remove.custom.project.confirmation": "Are you sure you want to remove the project in {0} from the Liberty Dashboard?", - "remove.custom.project.successful": "The project has been successfully removed from Liberty Dashboard", - "remove.custom.project.empty.list": "User added project list is empty. Nothing to remove", - "remove.custom.project.not.in.list": "Select project does not exist in Liberty Dashboard, or it was not manually added to Liberty Dashboard. Nothing to remove.", - "attach.debugger.liverty.dev.in": "Attaching debugger to Liberty server in {0}", - "cannot.attach.debugger.to.undefined": "Cannot attach debugger to an undefined project", - "liberty.dev.attach.debugger.failed": "The Liberty server may not have been started. Please start the Liberty server using the 'Start' or 'Start...' command in the Liberty dashboard. If you have started the Liberty server, please wait until you see the dev mode start up message and try attaching the debugger again.", - "liberty.dev.attach.debugger.failed.with.error": "Failed to attach debugger to selected project. The error is: {0}", + "remove.custom.project.successful": "The project is removed from the Liberty Dashboard.", + "remove.custom.project.empty.list": "The user-added project list is empty. Nothing to remove.", + "remove.custom.project.not.in.list": "The selected project does not exist in Liberty Dashboard, or it was not manually added to Liberty Dashboard. Nothing to remove.", + "attach.debugger.liverty.dev.in": "Attaching debugger to Liberty server in {0}.", + "cannot.attach.debugger.to.undefined": "Cannot attach debugger to an undefined project.", + "liberty.dev.attach.debugger.failed": "The Liberty server might not be started. Start the Liberty server by using the 'Start' or 'Start...' command in the Liberty dashboard. If you already started the Liberty server, wait until you see the dev mode startup message and try to attach the debugger again.", + "liberty.dev.attach.debugger.failed.with.error": "Failed to attach debugger to selected project. The error is: {0}.", "liberty.dev.debug.label": "Debug {0}", "liberty.dev.attach.debugger.failed.no.port.in.server.env": "Failed to detect remote debug port in {0}.", - "check.java.runtime.version.outdated": "Java 17 or more recent is required to run 'Liberty Tools for VS Code'. Please download and install a recent JDK.", + "check.java.runtime.version.outdated": "Java 17 or later is required to run 'Liberty Tools for VS Code'. Download and install a recent JDK.", "check.java.runtime.vscode.java.home": "The java.home variable defined in VS Code settings", "check.java.runtime.env.jdk.home": "The JDK_HOME environment variable", "check.java.runtime.env.java.home": "The JAVA_HOME environment variable", - "define.xml.java.home.message": "The Liberty Config Language Server requires Java 17 for functionality. Please set 'xml.java.home' to point to Java 17 in VS Code settings or set the system JAVA_HOME environment variable to point to Java 17.", + "define.xml.java.home.message": "The Liberty Config Language Server requires Java 17. Please set 'xml.java.home' to point to Java 17 in the VS Code settings or set the system JAVA_HOME environment variable to point to Java 17.", "check.java.runtime.dismiss.label": "Dismiss", - "open.jdk.download.part.missing.folder": " points to a missing folder", + "open.jdk.download.part.missing.folder": " points to a missing folder.", "open.jdk.download.part.no.runtime": " does not point to a Java runtime.", - "open.jdk.download.label": "Get the Java Development Kit", + "open.jdk.download.label": "Get the Java Development Kit.", "check.java.runtime.failed.locate": "Java runtime could not be located.", "hotkey.commands.title.refresh": "Liberty: Refresh projects", "hotkey.commands.title.start": "Liberty: Start", @@ -72,4 +72,4 @@ "hotkey.commands.title.add.project": "Liberty: Add Project to Liberty Dashboard", "hotkey.commands.title.remove.project": "Liberty: Remove Project from Liberty Dashboard", "hotkey.commands.title.show.commands": "Liberty: Show Liberty commands" -} \ No newline at end of file +} From 3b19523000bce77f08f7ab5b2d4fc3a9d002d1a5 Mon Sep 17 00:00:00 2001 From: David Mueller <48686014+dmuelle@users.noreply.github.com> Date: Tue, 6 Jun 2023 10:33:34 -0400 Subject: [PATCH 02/25] Update en.json --- src/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/en.json b/src/locales/en.json index 95612366..2942afed 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -41,7 +41,7 @@ "confirmation.button.label.no": "No", "remove.custom.project.confirmation": "Are you sure you want to remove the project in {0} from the Liberty Dashboard?", "remove.custom.project.successful": "The project is removed from the Liberty Dashboard.", - "remove.custom.project.empty.list": "The user-added project list is empty. Nothing to remove.", + "remove.custom.project.empty.list": "The user-added project list is empty. Nothing to remove.", "remove.custom.project.not.in.list": "The selected project does not exist in Liberty Dashboard, or it was not manually added to Liberty Dashboard. Nothing to remove.", "attach.debugger.liverty.dev.in": "Attaching debugger to Liberty server in {0}.", "cannot.attach.debugger.to.undefined": "Cannot attach debugger to an undefined project.", From 2923c9508eef220ee7732f977db4ad0c5ed170f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 19:38:40 +0000 Subject: [PATCH 03/25] Bump semver from 5.7.1 to 5.7.2 Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 60 +++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/package-lock.json b/package-lock.json index 452d79d0..c5a00aa5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -715,9 +715,9 @@ } }, "node_modules/@vscode/vsce/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, "bin": { "semver": "bin/semver" @@ -3157,9 +3157,9 @@ } }, "node_modules/execa/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, "bin": { "semver": "bin/semver" @@ -6416,9 +6416,9 @@ "dev": true }, "node_modules/normalize-package-data/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, "bin": { "semver": "bin/semver" @@ -6811,9 +6811,9 @@ } }, "node_modules/parse-semver/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, "bin": { "semver": "bin/semver" @@ -7918,9 +7918,9 @@ } }, "node_modules/semver": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", - "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -10631,9 +10631,9 @@ "dev": true }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true }, "supports-color": { @@ -12523,9 +12523,9 @@ } }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true }, "shebang-command": { @@ -15097,9 +15097,9 @@ "dev": true }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true } } @@ -15393,9 +15393,9 @@ }, "dependencies": { "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true } } @@ -16247,9 +16247,9 @@ } }, "semver": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", - "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "requires": { "lru-cache": "^6.0.0" } From 187d7a2cb56a511a6eb100f66c7c3f2b1cedf103 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Jul 2023 20:40:42 +0000 Subject: [PATCH 04/25] Bump word-wrap from 1.2.3 to 1.2.4 Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 452d79d0..e131494b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9907,9 +9907,9 @@ "integrity": "sha512-IHpzORub7kYlb8A43Iig3reOvlcBJGX9gZ0WycHhghHtA65X0LYnMRuJs+aH1abVnMJztQkvQNlltnbPi5aGIA==" }, "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz", + "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==", "dev": true, "engines": { "node": ">=0.10.0" @@ -17836,9 +17836,9 @@ "integrity": "sha512-IHpzORub7kYlb8A43Iig3reOvlcBJGX9gZ0WycHhghHtA65X0LYnMRuJs+aH1abVnMJztQkvQNlltnbPi5aGIA==" }, "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz", + "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==", "dev": true }, "workerpool": { From 5c76c7f8cb8f3b191f98b32ef8d553ba9f524d28 Mon Sep 17 00:00:00 2001 From: David Mueller <48686014+dmuelle@users.noreply.github.com> Date: Fri, 8 Sep 2023 14:45:03 -0400 Subject: [PATCH 05/25] Update src/locales/en.json Co-authored-by: Trevor Crawford --- src/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/en.json b/src/locales/en.json index 2942afed..93b1423f 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -53,7 +53,7 @@ "check.java.runtime.vscode.java.home": "The java.home variable defined in VS Code settings", "check.java.runtime.env.jdk.home": "The JDK_HOME environment variable", "check.java.runtime.env.java.home": "The JAVA_HOME environment variable", - "define.xml.java.home.message": "The Liberty Config Language Server requires Java 17. Please set 'xml.java.home' to point to Java 17 in the VS Code settings or set the system JAVA_HOME environment variable to point to Java 17.", + "define.xml.java.home.message": "The Liberty Config Language Server requires Java 17 or later. Please set 'xml.java.home' to point to Java 17 or later in the VS Code settings or set the system JAVA_HOME environment variable to point to Java 17 or later.", "check.java.runtime.dismiss.label": "Dismiss", "open.jdk.download.part.missing.folder": " points to a missing folder.", "open.jdk.download.part.no.runtime": " does not point to a Java runtime.", From 1914859d7619159d8e029738739d6f3fa5d8fe8a Mon Sep 17 00:00:00 2001 From: David Mueller <48686014+dmuelle@users.noreply.github.com> Date: Fri, 8 Sep 2023 14:45:43 -0400 Subject: [PATCH 06/25] Update src/locales/en.json Co-authored-by: Trevor Crawford --- src/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/en.json b/src/locales/en.json index 93b1423f..b91f404b 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -33,7 +33,7 @@ "error.parsing.pom": "Unable to parse pom file. The error is {0}.", "refreshing.liberty.dashboard": "Refreshing Liberty Dashboard projects...", "no.liberty.project.found.in.empty.workspace": "No Liberty project was found in empty workspace.", - "add.project.manually.no.projects.available.to.add": "No workspace folders are available to be added to Liberty Dashboard.", + "add.project.manually.no.projects.available.to.add": "No workspace folders are available to be added to the Liberty Dashboard.", "add.project.manually.message.0": "The selected project at {0} is added to the Liberty Dashboard.", "add.project.manually.message.1": "The selected project at {0} already exists in the Liberty Dashboard.", "add.project.manually.message.2": "The selected project at {0} is not a Maven or Gradle project.", From e6c1e9c110dc5806eff1dc08f95d150e4e3c3f6c Mon Sep 17 00:00:00 2001 From: David Mueller <48686014+dmuelle@users.noreply.github.com> Date: Fri, 8 Sep 2023 14:45:55 -0400 Subject: [PATCH 07/25] Update src/locales/en.json Co-authored-by: Trevor Crawford --- src/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/en.json b/src/locales/en.json index b91f404b..7617add4 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -42,7 +42,7 @@ "remove.custom.project.confirmation": "Are you sure you want to remove the project in {0} from the Liberty Dashboard?", "remove.custom.project.successful": "The project is removed from the Liberty Dashboard.", "remove.custom.project.empty.list": "The user-added project list is empty. Nothing to remove.", - "remove.custom.project.not.in.list": "The selected project does not exist in Liberty Dashboard, or it was not manually added to Liberty Dashboard. Nothing to remove.", + "remove.custom.project.not.in.list": "The selected project does not exist in the Liberty Dashboard, or it was not manually added to the Liberty Dashboard. Nothing to remove.", "attach.debugger.liverty.dev.in": "Attaching debugger to Liberty server in {0}.", "cannot.attach.debugger.to.undefined": "Cannot attach debugger to an undefined project.", "liberty.dev.attach.debugger.failed": "The Liberty server might not be started. Start the Liberty server by using the 'Start' or 'Start...' command in the Liberty dashboard. If you already started the Liberty server, wait until you see the dev mode startup message and try to attach the debugger again.", From a77960e2a9550ff2ad1b5badb157211b34bcacae Mon Sep 17 00:00:00 2001 From: David Mueller <48686014+dmuelle@users.noreply.github.com> Date: Fri, 8 Sep 2023 14:46:46 -0400 Subject: [PATCH 08/25] Update src/locales/en.json Co-authored-by: Trevor Crawford --- src/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/en.json b/src/locales/en.json index 7617add4..4a429d8c 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -45,7 +45,7 @@ "remove.custom.project.not.in.list": "The selected project does not exist in the Liberty Dashboard, or it was not manually added to the Liberty Dashboard. Nothing to remove.", "attach.debugger.liverty.dev.in": "Attaching debugger to Liberty server in {0}.", "cannot.attach.debugger.to.undefined": "Cannot attach debugger to an undefined project.", - "liberty.dev.attach.debugger.failed": "The Liberty server might not be started. Start the Liberty server by using the 'Start' or 'Start...' command in the Liberty dashboard. If you already started the Liberty server, wait until you see the dev mode startup message and try to attach the debugger again.", + "liberty.dev.attach.debugger.failed": "The Liberty server might not be started. Start the Liberty server by using the 'Start' or 'Start...' command in the Liberty dashboard. If you already started the Liberty server, wait until you see the Liberty dev mode startup message and try to attach the debugger again.", "liberty.dev.attach.debugger.failed.with.error": "Failed to attach debugger to selected project. The error is: {0}.", "liberty.dev.debug.label": "Debug {0}", "liberty.dev.attach.debugger.failed.no.port.in.server.env": "Failed to detect remote debug port in {0}.", From 29ca1566b2fb6fae6465772ccac52bde98fc5d6a Mon Sep 17 00:00:00 2001 From: David Mueller <48686014+dmuelle@users.noreply.github.com> Date: Fri, 8 Sep 2023 14:47:13 -0400 Subject: [PATCH 09/25] Update src/locales/en.json --- src/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/en.json b/src/locales/en.json index 4a429d8c..4c4b3b8c 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -11,7 +11,7 @@ "jakarta.ls.thumbs.up": "LSP4Jakarta $(thumbsup)", "jakarta.ls.started": "Language Server for Jakarta started.", "no.liberty.projects.found": "No liberty projects found.", - "starting.liberty.dev.on": "Starting liberty dev on {0}.", + "starting.liberty.dev.on": "Starting liberty dev mode on {0}.", "cannot.start.liberty.dev": "Cannot start liberty dev on an undefined project.", "stopping.liverty.dev.on": "Stopping liberty dev on {0}.", "liberty.dev.not.started.on": "liberty dev did not start on {0}.", From 1ef666f5d0fefba13d5dc0cfc1bca60c19296008 Mon Sep 17 00:00:00 2001 From: David Mueller <48686014+dmuelle@users.noreply.github.com> Date: Fri, 8 Sep 2023 14:47:44 -0400 Subject: [PATCH 10/25] Update src/locales/en.json --- src/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/en.json b/src/locales/en.json index 4c4b3b8c..4e08ed89 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -12,7 +12,7 @@ "jakarta.ls.started": "Language Server for Jakarta started.", "no.liberty.projects.found": "No liberty projects found.", "starting.liberty.dev.on": "Starting liberty dev mode on {0}.", - "cannot.start.liberty.dev": "Cannot start liberty dev on an undefined project.", + "cannot.start.liberty.dev": "Cannot start liberty dev mode on an undefined project.", "stopping.liverty.dev.on": "Stopping liberty dev on {0}.", "liberty.dev.not.started.on": "liberty dev did not start on {0}.", "cannot.stop.liberty.dev.on.undefined": "Cannot stop liberty dev on an undefined project.", From 805cfcc78fbee506453aead077bed7da3061cdd9 Mon Sep 17 00:00:00 2001 From: David Mueller <48686014+dmuelle@users.noreply.github.com> Date: Fri, 8 Sep 2023 14:48:01 -0400 Subject: [PATCH 11/25] Update src/locales/en.json --- src/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/en.json b/src/locales/en.json index 4e08ed89..679a9bd1 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -13,7 +13,7 @@ "no.liberty.projects.found": "No liberty projects found.", "starting.liberty.dev.on": "Starting liberty dev mode on {0}.", "cannot.start.liberty.dev": "Cannot start liberty dev mode on an undefined project.", - "stopping.liverty.dev.on": "Stopping liberty dev on {0}.", + "stopping.liverty.dev.on": "Stopping liberty dev mode on {0}.", "liberty.dev.not.started.on": "liberty dev did not start on {0}.", "cannot.stop.liberty.dev.on.undefined": "Cannot stop liberty dev on an undefined project.", "params.must.start.with.dash": "Parameters must start with -", From b71bcea7b5a491ae52a8e3ce86943b45acf72f61 Mon Sep 17 00:00:00 2001 From: David Mueller <48686014+dmuelle@users.noreply.github.com> Date: Fri, 8 Sep 2023 14:48:22 -0400 Subject: [PATCH 12/25] Update src/locales/en.json --- src/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/en.json b/src/locales/en.json index 679a9bd1..c667a15c 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -14,7 +14,7 @@ "starting.liberty.dev.on": "Starting liberty dev mode on {0}.", "cannot.start.liberty.dev": "Cannot start liberty dev mode on an undefined project.", "stopping.liverty.dev.on": "Stopping liberty dev mode on {0}.", - "liberty.dev.not.started.on": "liberty dev did not start on {0}.", + "liberty.dev.not.started.on": "liberty dev mode did not start on {0}.", "cannot.stop.liberty.dev.on.undefined": "Cannot stop liberty dev on an undefined project.", "params.must.start.with.dash": "Parameters must start with -", "starting.liberty.dev.with.custom.param": "Starting liberty dev with custom parameters on {0}.", From 7f901d37f4014111496059d3864a7b0a3698f4c1 Mon Sep 17 00:00:00 2001 From: David Mueller <48686014+dmuelle@users.noreply.github.com> Date: Fri, 8 Sep 2023 14:50:03 -0400 Subject: [PATCH 13/25] Update en.json --- src/locales/en.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index c667a15c..9675095d 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -11,19 +11,19 @@ "jakarta.ls.thumbs.up": "LSP4Jakarta $(thumbsup)", "jakarta.ls.started": "Language Server for Jakarta started.", "no.liberty.projects.found": "No liberty projects found.", - "starting.liberty.dev.on": "Starting liberty dev mode on {0}.", - "cannot.start.liberty.dev": "Cannot start liberty dev mode on an undefined project.", - "stopping.liverty.dev.on": "Stopping liberty dev mode on {0}.", + "starting.liberty.dev.on": "Starting Liberty dev mode on {0}.", + "cannot.start.liberty.dev": "Cannot start Liberty dev mode on an undefined project.", + "stopping.liverty.dev.on": "Stopping Liberty dev mode on {0}.", "liberty.dev.not.started.on": "liberty dev mode did not start on {0}.", - "cannot.stop.liberty.dev.on.undefined": "Cannot stop liberty dev on an undefined project.", + "cannot.stop.liberty.dev.on.undefined": "Cannot stop Liberty dev mode on an undefined project.", "params.must.start.with.dash": "Parameters must start with -", - "starting.liberty.dev.with.custom.param": "Starting liberty dev with custom parameters on {0}.", + "starting.liberty.dev.with.custom.param": "Starting Liberty dev mode with custom parameters on {0}.", "specify.custom.parms.maven": "Specify custom parameters for 'mvn liberty:dev' command.", "specify.custom.parms.gradle": "Specify custom parameters for 'gradle libertyDev' command.", - "cannot.custom.start.liberty.dev": "Cannot custom start liberty dev on an undefined project.", - "cannot.start.liberty.dev.in.container.on.undefined.project": "Cannot start liberty dev in a container on an undefined project.", - "running.liberty.dev.tests.on": "Running liberty dev tests on {0}.", - "liberty.dev.has.not.been.started.on": "liberty dev did not start on {0}.", + "cannot.custom.start.liberty.dev": "Cannot custom start Liberty dev mode on an undefined project.", + "cannot.start.liberty.dev.in.container.on.undefined.project": "Cannot start Liberty dev mode in a container on an undefined project.", + "running.liberty.dev.tests.on": "Running Liberty dev mode tests on {0}.", + "liberty.dev.has.not.been.started.on": "Liberty dev mode did not start on {0}.", "cannot.run.test.on.undefined.project": "Cannot run tests on an undefined project.", "test.report.does.not.exist.run.test.first": "Test report ({0}) does not exist. Run tests to generate a test report.", "cannot.open.test.reports.on.undefined.project": "Cannot open test reports on an undefined project.", From 22323de31965570ea4357311dafd0b83243d80eb Mon Sep 17 00:00:00 2001 From: David Mueller <48686014+dmuelle@users.noreply.github.com> Date: Fri, 8 Sep 2023 14:59:21 -0400 Subject: [PATCH 14/25] Update src/locales/en.json Co-authored-by: Trevor Crawford --- src/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/en.json b/src/locales/en.json index 9675095d..265ec37b 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -14,7 +14,7 @@ "starting.liberty.dev.on": "Starting Liberty dev mode on {0}.", "cannot.start.liberty.dev": "Cannot start Liberty dev mode on an undefined project.", "stopping.liverty.dev.on": "Stopping Liberty dev mode on {0}.", - "liberty.dev.not.started.on": "liberty dev mode did not start on {0}.", + "liberty.dev.not.started.on": "Liberty dev mode did not start on {0}.", "cannot.stop.liberty.dev.on.undefined": "Cannot stop Liberty dev mode on an undefined project.", "params.must.start.with.dash": "Parameters must start with -", "starting.liberty.dev.with.custom.param": "Starting Liberty dev mode with custom parameters on {0}.", From 2855965367c6efdfabb4a80fe4dc5373616a5330 Mon Sep 17 00:00:00 2001 From: Trevor Crawford Date: Sun, 10 Sep 2023 13:39:27 -0400 Subject: [PATCH 15/25] Update lcls to v2.0.1 --- gulpfile.js | 2 +- package.json | 2 +- src/extension.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 6710f3bd..c24a7647 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -3,7 +3,7 @@ const download = require("gulp-download2"); const cp = require("child_process"); const libertyGroupId = "io.openliberty.tools"; -const libertyVersion = "2.0"; +const libertyVersion = "2.0.1"; const jakartaGroupId = "org.eclipse.lsp4jakarta"; const jakartaVersion = "0.1.1"; var releaseLevel = "releases"; //"snapshots"; //snapshots or releases diff --git a/package.json b/package.json index 77c4b592..7db52092 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "./jars/org.eclipse.lsp4jakarta.jdt.core-0.1.1.jar" ], "xml.javaExtensions": [ - "./jars/liberty-langserver-lemminx-2.0-jar-with-dependencies.jar" + "./jars/liberty-langserver-lemminx-2.0.1-jar-with-dependencies.jar" ], "views": { "explorer": [ diff --git a/src/extension.ts b/src/extension.ts index 347587ed..2ea0973c 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -22,7 +22,7 @@ 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 LIBERTY_LS_JAR = "liberty-langserver-2.0.1-jar-with-dependencies.jar"; export const JAKARTA_LS_JAR = "org.eclipse.lsp4jakarta.ls-0.1.1-jar-with-dependencies.jar"; let libertyClient: LanguageClient; From 6601b946656e43616ee5295d75727b3220750366 Mon Sep 17 00:00:00 2001 From: Trevor Crawford Date: Sun, 10 Sep 2023 14:35:23 -0400 Subject: [PATCH 16/25] update to v23.0.9-SNAPSHOT --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 452d79d0..461bc93d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "liberty-dev-vscode-ext", - "version": "23.0.7-SNAPSHOT", + "version": "23.0.9-SNAPSHOT", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "liberty-dev-vscode-ext", - "version": "23.0.7-SNAPSHOT", + "version": "23.0.9-SNAPSHOT", "license": "EPL-2.0", "dependencies": { "@types/fs-extra": "^8.1.0", diff --git a/package.json b/package.json index 77c4b592..25d181ad 100644 --- a/package.json +++ b/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.9-SNAPSHOT", "publisher": "Open-Liberty", "repository": { "type": "git", From 51d21b4aa6c4364340336ae01c8364c55284b07e Mon Sep 17 00:00:00 2001 From: Evie Lau <689163+evie-lau@users.noreply.github.com> Date: Mon, 11 Sep 2023 13:16:47 -0500 Subject: [PATCH 17/25] Allow LCLS to handle custom config files (#286) * Send all .properties and .env files to LCLS. Send fileChange events for .properties, .env, and liberty-plugin-config.xml to LCLS --- src/extension.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index 2ea0973c..768bacab 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -211,14 +211,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") ], } }; From 4ea8506cf6ae60a93ec09d2c3c01e65704691ae0 Mon Sep 17 00:00:00 2001 From: Trevor Crawford Date: Wed, 20 Sep 2023 14:35:37 -0400 Subject: [PATCH 18/25] Update to 23.0.9 and add 23.0.9 release notes --- CHANGELOG.md | 17 +++++++++++++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73b8434b..9cda6618 100644 --- a/CHANGELOG.md +++ b/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 enhancements: + +- 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. diff --git a/package-lock.json b/package-lock.json index afd901f0..e59851c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "liberty-dev-vscode-ext", - "version": "23.0.9-SNAPSHOT", + "version": "23.0.9", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "liberty-dev-vscode-ext", - "version": "23.0.9-SNAPSHOT", + "version": "23.0.9", "license": "EPL-2.0", "dependencies": { "@types/fs-extra": "^8.1.0", diff --git a/package.json b/package.json index ed8d0606..1fe42f0c 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "liberty-dev-vscode-ext", "displayName": "Liberty Tools", "description": "Liberty Tools for Visual Studio Code", - "version": "23.0.9-SNAPSHOT", + "version": "23.0.9", "publisher": "Open-Liberty", "repository": { "type": "git", From 403d1a03bb29ef254abc5ed89cb40ba12129144c Mon Sep 17 00:00:00 2001 From: Trevor Crawford Date: Wed, 20 Sep 2023 15:13:30 -0400 Subject: [PATCH 19/25] Fix wording --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cda6618..951606f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ All notable changes to the Liberty Tools extension will be documented below. 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 enhancements: +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 From c379afd4f3de9ac2447a04308c51f69c13b1c76f Mon Sep 17 00:00:00 2001 From: Trevor Crawford Date: Mon, 16 Oct 2023 12:05:53 -0400 Subject: [PATCH 20/25] Update to version 23.0.12-SNAPSHOT --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index e59851c7..ca2bfa2f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "liberty-dev-vscode-ext", - "version": "23.0.9", + "version": "23.0.12-SNAPSHOT", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "liberty-dev-vscode-ext", - "version": "23.0.9", + "version": "23.0.12-SNAPSHOT", "license": "EPL-2.0", "dependencies": { "@types/fs-extra": "^8.1.0", diff --git a/package.json b/package.json index 1fe42f0c..cec208e8 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "liberty-dev-vscode-ext", "displayName": "Liberty Tools", "description": "Liberty Tools for Visual Studio Code", - "version": "23.0.9", + "version": "23.0.12-SNAPSHOT", "publisher": "Open-Liberty", "repository": { "type": "git", From 8bf5fa384aef201ca9a61f98f4a116526aa75734 Mon Sep 17 00:00:00 2001 From: VAISAKH T Date: Thu, 19 Oct 2023 21:39:22 +0530 Subject: [PATCH 21/25] [OpenLiberty#294] Added 2.1-SNAPSHOT version of the LCLS --- gulpfile.js | 2 +- package.json | 2 +- src/extension.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index c24a7647..a829d301 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -3,7 +3,7 @@ const download = require("gulp-download2"); const cp = require("child_process"); const libertyGroupId = "io.openliberty.tools"; -const libertyVersion = "2.0.1"; +const libertyVersion = "2.1-SNAPSHOT"; const jakartaGroupId = "org.eclipse.lsp4jakarta"; const jakartaVersion = "0.1.1"; var releaseLevel = "releases"; //"snapshots"; //snapshots or releases diff --git a/package.json b/package.json index 1fe42f0c..ed730ec6 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "./jars/org.eclipse.lsp4jakarta.jdt.core-0.1.1.jar" ], "xml.javaExtensions": [ - "./jars/liberty-langserver-lemminx-2.0.1-jar-with-dependencies.jar" + "./jars/liberty-langserver-lemminx-2.1-SNAPSHOT-jar-with-dependencies.jar" ], "views": { "explorer": [ diff --git a/src/extension.ts b/src/extension.ts index 768bacab..c0be64c1 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -22,7 +22,7 @@ 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.1-jar-with-dependencies.jar"; +export const LIBERTY_LS_JAR = "liberty-langserver-2.1-SNAPSHOT-jar-with-dependencies.jar"; export const JAKARTA_LS_JAR = "org.eclipse.lsp4jakarta.ls-0.1.1-jar-with-dependencies.jar"; let libertyClient: LanguageClient; From 6a33f8aac905f52c359f96cc4cf026158b574991 Mon Sep 17 00:00:00 2001 From: "Andrew J. Mauer" Date: Fri, 13 Oct 2023 18:10:16 +0100 Subject: [PATCH 22/25] Integrate re-structured LSP4Jakarta release in liberty-tools-vscode --- gulpfile.js | 7 +++---- package.json | 2 +- src/definitions/lsp4jakartaLSRequestNames.ts | 7 ++++--- src/extension.ts | 7 ++++--- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index c24a7647..22fffc3d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -5,8 +5,8 @@ const cp = require("child_process"); const libertyGroupId = "io.openliberty.tools"; const libertyVersion = "2.0.1"; const jakartaGroupId = "org.eclipse.lsp4jakarta"; -const jakartaVersion = "0.1.1"; -var releaseLevel = "releases"; //"snapshots"; //snapshots or releases +const jakartaVersion = "0.2.0-SNAPSHOT"; +var releaseLevel = "snapshots"; //"snapshots"; //snapshots or releases const libertyLemminxName = "liberty-langserver-lemminx-" + libertyVersion + "-jar-with-dependencies.jar"; const libertyLemminxDir = "../liberty-language-server/lemminx-liberty"; @@ -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) => { diff --git a/package.json b/package.json index 1fe42f0c..c2b16395 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ ], "contributes": { "javaExtensions": [ - "./jars/org.eclipse.lsp4jakarta.jdt.core-0.1.1.jar" + "./jars/org.eclipse.lsp4jakarta.jdt.core-0.2.0-SNAPSHOT.jar" ], "xml.javaExtensions": [ "./jars/liberty-langserver-lemminx-2.0.1-jar-with-dependencies.jar" diff --git a/src/definitions/lsp4jakartaLSRequestNames.ts b/src/definitions/lsp4jakartaLSRequestNames.ts index 4e692bd2..2c380e69 100644 --- a/src/definitions/lsp4jakartaLSRequestNames.ts +++ b/src/definitions/lsp4jakartaLSRequestNames.ts @@ -11,6 +11,7 @@ // Jakarta Language API 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"; \ No newline at end of file +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"; diff --git a/src/extension.ts b/src/extension.ts index 768bacab..11b19f62 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -23,7 +23,7 @@ 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.1-jar-with-dependencies.jar"; -export const JAKARTA_LS_JAR = "org.eclipse.lsp4jakarta.ls-0.1.1-jar-with-dependencies.jar"; +export const JAKARTA_LS_JAR = "org.eclipse.lsp4jakarta.ls-0.2.0-SNAPSHOT-jar-with-dependencies.jar"; let libertyClient: LanguageClient; let jakartaClient: LanguageClient; @@ -76,10 +76,11 @@ export async function activate(context: vscode.ExtensionContext): Promise console.log("LSP4Jakarta is ready, binding requests..."); // Delegate requests from Jakarta LS to the Jakarta JDT core - bindRequest(lsp4jakartaLS.JAVA_CLASSPATH_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"); From ef71bfa4639c307c00e1de76123dd8a76209044c Mon Sep 17 00:00:00 2001 From: VAISAKH T Date: Fri, 20 Oct 2023 10:28:51 +0530 Subject: [PATCH 23/25] updated releaseLevel to "snapshots" --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index a829d301..613041a4 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -6,7 +6,7 @@ const libertyGroupId = "io.openliberty.tools"; const libertyVersion = "2.1-SNAPSHOT"; const jakartaGroupId = "org.eclipse.lsp4jakarta"; const jakartaVersion = "0.1.1"; -var releaseLevel = "releases"; //"snapshots"; //snapshots or releases +var releaseLevel = "snapshots"; //"releases"; //snapshots or releases const libertyLemminxName = "liberty-langserver-lemminx-" + libertyVersion + "-jar-with-dependencies.jar"; const libertyLemminxDir = "../liberty-language-server/lemminx-liberty"; From 6cec40fd898c2bd3b61eb8fd93513d948af203df Mon Sep 17 00:00:00 2001 From: "Andrew J. Mauer" Date: Mon, 30 Oct 2023 14:47:01 +0100 Subject: [PATCH 24/25] add support for new jakarta LS/Client message - fileInfo --- src/definitions/lsp4jakartaLSRequestNames.ts | 1 + src/extension.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/definitions/lsp4jakartaLSRequestNames.ts b/src/definitions/lsp4jakartaLSRequestNames.ts index 2c380e69..13917bb3 100644 --- a/src/definitions/lsp4jakartaLSRequestNames.ts +++ b/src/definitions/lsp4jakartaLSRequestNames.ts @@ -9,6 +9,7 @@ */ // 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_COMPLETION_REQUEST = "jakarta/java/completion"; diff --git a/src/extension.ts b/src/extension.ts index 3dd95e06..ab14ca89 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -76,6 +76,7 @@ export async function activate(context: vscode.ExtensionContext): Promise console.log("LSP4Jakarta is ready, binding requests..."); // Delegate requests from Jakarta LS to the Jakarta JDT core + bindRequest(lsp4jakartaLS.FILEINFO_REQUEST); bindRequest(lsp4jakartaLS.JAVA_COMPLETION_REQUEST); bindRequest(lsp4jakartaLS.JAVA_CODEACTION_REQUEST); bindRequest(lsp4jakartaLS.JAVA_CODEACTION_RESOLVE_REQUEST); From 42cd2abb9d19df5a4c8b2b60e31b43e94622921c Mon Sep 17 00:00:00 2001 From: Trevor Crawford Date: Thu, 16 Nov 2023 14:49:35 -0500 Subject: [PATCH 25/25] Update LCLS and LSP4Jakarta dependencies to latest releases --- gulpfile.js | 6 +++--- package.json | 4 ++-- src/extension.ts | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 9942c3d5..47e501ba 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -3,10 +3,10 @@ const download = require("gulp-download2"); const cp = require("child_process"); const libertyGroupId = "io.openliberty.tools"; -const libertyVersion = "2.1-SNAPSHOT"; +const libertyVersion = "2.1.1"; const jakartaGroupId = "org.eclipse.lsp4jakarta"; -const jakartaVersion = "0.2.0-SNAPSHOT"; -var releaseLevel = "snapshots"; //"snapshots"; //snapshots or releases +const jakartaVersion = "0.2.0"; +var releaseLevel = "releases"; //"snapshots"; //snapshots or releases const libertyLemminxName = "liberty-langserver-lemminx-" + libertyVersion + "-jar-with-dependencies.jar"; const libertyLemminxDir = "../liberty-language-server/lemminx-liberty"; diff --git a/package.json b/package.json index 86802a32..59385c1e 100644 --- a/package.json +++ b/package.json @@ -50,10 +50,10 @@ ], "contributes": { "javaExtensions": [ - "./jars/org.eclipse.lsp4jakarta.jdt.core-0.2.0-SNAPSHOT.jar" + "./jars/org.eclipse.lsp4jakarta.jdt.core-0.2.0.jar" ], "xml.javaExtensions": [ - "./jars/liberty-langserver-lemminx-2.1-SNAPSHOT-jar-with-dependencies.jar" + "./jars/liberty-langserver-lemminx-2.1.1-jar-with-dependencies.jar" ], "views": { "explorer": [ diff --git a/src/extension.ts b/src/extension.ts index ab14ca89..0f887853 100644 --- a/src/extension.ts +++ b/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.1-SNAPSHOT-jar-with-dependencies.jar"; -export const JAKARTA_LS_JAR = "org.eclipse.lsp4jakarta.ls-0.2.0-SNAPSHOT-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;