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

…ection_integrationTest

CHANGELOG.md

@@ -2,13 +2,43 @@
 
 All notable changes to the Liberty Tools extension will be documented below.
 
+## 24.0.3
+
+Version 24.0.3 of Liberty Tools for Visual Studio Code is a fix release that contains minor enhancements and fixes. Version 24.0.3 requires Visual Studio Code version 1.78+ and requires Java 17 or later.
+
+Notable changes:
+
+- Updated [Eclipse LSP4Jakarta](https://github.com/eclipse/lsp4jakarta) version to 0.2.1 to resolve bug where Jakarta EE diagnostics were not appearing.
+  - https://github.com/OpenLiberty/liberty-tools-vscode/issues/322
+  - For more information regarding changes for version 0.2.1, refer to the release notes: https://github.com/eclipse/lsp4jakarta/releases/tag/0.2.1
+- Added instructions for when the Liberty dashboard detects no Liberty projects.
+  - https://github.com/OpenLiberty/liberty-tools-vscode/issues/203
+
+See the [commit log](https://github.com/OpenLiberty/liberty-tools-vscode/compare/23.0.12...24.0.3) for the full set of changes since the previous release.
+
+## 23.0.12
+
+Version 23.0.12 of Liberty Tools for Visual Studio Code contains enhancements for editing support. Version 23.0.12 requires Visual Studio Code version 1.78+ and requires Java 17 or later.
+
+NOTE: There is a known problem with Jakarta EE diagnostics in this release. For details on the issue and the workaround, please refer to [issue #322](https://github.com/OpenLiberty/liberty-tools-vscode/issues/322). For more known problems and workarounds for this release, please refer to the wiki: https://github.com/OpenLiberty/liberty-tools-vscode/wiki/Known-Problems-and-Limitations.
+
+Notable changes:
+
+- Updated [Liberty Config Language Server](https://github.com/OpenLiberty/liberty-language-server) version to 2.1.1. For information regarding changes for version 2.1, refer to the release notes linked below:
+  - https://github.com/OpenLiberty/liberty-language-server/releases/tag/liberty-langserver-2.1
+  - https://github.com/OpenLiberty/liberty-language-server/releases/tag/lemminx-liberty-2.1
+- Updated [Eclipse LSP4Jakarta](https://github.com/eclipse/lsp4jakarta) version to 0.2.0. For more information regarding changes for version 0.2.0, refer to the release notes linked below:
+  - https://github.com/eclipse/lsp4jakarta/releases/tag/0.2.0
+
+See the [commit log](https://github.com/OpenLiberty/liberty-tools-vscode/compare/23.0.9...23.0.12) for the full set of changes since the previous release.
+
 ## 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:
+- Updated [Liberty Config Language Server](https://github.com/OpenLiberty/liberty-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
@@ -18,7 +48,6 @@ Notable changes:
 
 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.

DEVELOPING.md

@@ -30,8 +30,8 @@ Ensure you have [Node.js and npm](https://docs.npmjs.com/downloading-and-install
      - Navigate to the Extensions activity bar, or use the shortcut `Ctrl`-`Shift`-`X`
      - Click the `...` dropdown menu and select `Install from VSIX` and choose the generated `liberty-tools-vscode-xxx.vsix` file
 
-Step 5 downloads the JARs for Liberty Config Language Server and Eclipse LSP4Jakarta that are consumed by the VS Code client.
-If you would like a different version of the language servers other than what is available to download, the following instructions explain how to build these JARs locally. Then rerun steps 6 and 7.
+> Step 5 downloads the JARs for Liberty Config Language Server and Eclipse LSP4Jakarta that are consumed by the VS Code client.
+If you would like a different version of the language servers other than what is available to download, the following instructions explain how to build these JARs locally.
 
 ## Language Servers
 
@@ -53,6 +53,17 @@ For more information on building Liberty Config Language Server, see the project
 
 For more information on building Eclipse LSP4Jakarta, see the project documentation on [GitHub](https://github.com/eclipse/lsp4jakarta/blob/main/docs/BUILDING.md). Note that there are [prerequisites](https://github.com/eclipse/lsp4jakarta/blob/main/docs/BUILDING.md#prerequisites) to building this project locally.
 
+### Debugging Language Servers
+When running the extension with locally built language servers, a debugger can be attached to the language server process.
+The debug ports are as follows:
+
+- Liberty-LemminX: `1054`
+- Liberty Language Server: `8002`
+- Jakarta LS: `8003`
+
+
+With the `liberty-language-server` project opened in VSCode, run `Debug attach liberty-ls` or `Debug attach liberty-lemminx` to attach the respective debugger to the running extension.
+
 ## Localization
 
 ### package.json

NOTICE.md → NOTICE

@@ -311,8 +311,13 @@ under the ISC License.
 
 at-least-node | Copyright (c) 2020 Ryan Zimmerman <opensrc@ryanzim.com>
 graceful-fs | Copyright (c) Isaac Z. Schlueter  Ben Noordhuis  and Contributors
+lru-cache | Copyright (c) 2010-2023 Isaac Z. Schlueter and Contributors
+minimatch | Copyright (c) 2011-2023 Isaac Z. Schlueter and Contributors
 sax | Copyright (c) Isaac Z. Schlueter and Contributors Copyright Mathias Bynens <https://mathiasbynens.be/>
+semver | Copyright (c) Isaac Z. Schlueter and Contributors
 which | Copyright (c) Isaac Z. Schlueter and Contributors
+yallist | Copyright (c) 2015-2023 Isaac Z. Schlueter and Contributors
+
 
 ISC License
 
@@ -342,6 +347,8 @@ under the MIT License:
 @types/node | Copyright (c) Microsoft Corporation. All rights reserved.
 @types/semver | Copyright (c) Microsoft Corporation.
 @types/xml2js | Copyright (c) Microsoft Corporation.
+balanced-match | Copyright (c) 2013 Julian Gruber <julian@juliangruber.com>
+brace-expansion | Copyright (c) 2013 Julian Gruber <julian@juliangruber.com>
 fs-extra | Copyright (c) 2011-2017 JP Richardson
 jsonfile | Copyright (c) 2012-2015 JP Richardson <jprichardson@gmail.com>
 jsonpath-plus | Copyright (c) 2011-2019 Stefan Goessner, Subbu Allamaraju, Mike Brevoort,
@@ -356,6 +363,7 @@ vscode-languageserver-types | Copyright (c) Microsoft Corporation
 xml2js | Copyright 2010, 2011, 2012, 2013. All rights reserved.
 xmlbuilder | Copyright (c) 2013 Ozgur Ozcitak
 
+
 Permission is hereby granted, free of charge, to any person obtaining a 
 copy of this software and associated documentation files (the 
 "Software"), to deal in the Software without restriction, including 

docs/user-guide.md

@@ -227,6 +227,10 @@ Liberty Tools editing assistance provides code completion, diagnostics, and quic
 
 ![Eclipse LSP4MP microprofile-config.properties completion](/docs/user-guide-screenshots/mp_completion.png)
 
+3. To use Jakarta EE-specific and MicroProfile-specific quick-fixes, hover over a Jakarta EE or MicroProfile diagnostic. A pop-up dialog appears that contains the diagnostic message and a **Quick Fix** link, if a quick-fix is available. Click the **Quick Fix...** link to view a list of quick-fix options.
+
+![Jakarta EE quick fix](/docs/user-guide-screenshots/LSP4Jakarta-quickfix.png)
+
 Jakarta EE API configuration assistance is offered through Eclipse LSP4Jakarta, the Language Server for Jakarta EE. For more information, see the [project documentation in GitHub](https://github.com/eclipse/lsp4jakarta#eclipse-lsp4jakarta).
 
 MicroProfile EE API configuration assistance is offered through Eclipse LSP4MP, the Language Server for MicroProfile. For more information, see the [project documentation in GitHub](https://github.com/eclipse/lsp4mp#eclipse-lsp4mp---language-server-for-microprofile).

gulpfile.js

@@ -5,7 +5,7 @@ const cp = require("child_process");
 const libertyGroupId = "io.openliberty.tools";
 const libertyVersion = "2.1.1";
 const jakartaGroupId = "org.eclipse.lsp4jakarta";
-const jakartaVersion = "0.2.0";
+const jakartaVersion = "0.2.1";
 var releaseLevel = "releases";  //"snapshots"; //snapshots or releases
 
 const libertyLemminxName = "liberty-langserver-lemminx-" + libertyVersion + "-jar-with-dependencies.jar";