You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by db...@apache.org on 2023/11/22 13:39:50 UTC
(netbeans) branch master updated: LSP: Minor changes.
This is an automated email from the ASF dual-hosted git repository.
dbalek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new a3fb3eac29 LSP: Minor changes.
new 2264941c8f Merge pull request #6739 from dbalek/dbalek/minor-changes
a3fb3eac29 is described below
commit a3fb3eac29337351a55bb7562d792c76e44b8b2f
Author: Dusan Balek <du...@oracle.com>
AuthorDate: Wed Nov 22 09:37:04 2023 +0100
LSP: Minor changes.
---
.../src/org/netbeans/modules/java/lsp/server/protocol/Server.java | 2 +-
java/java.lsp.server/vscode/package-lock.json | 4 ++--
java/java.lsp.server/vscode/src/nbcode.ts | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
index 85e8ad0b25..b427a84993 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
@@ -207,7 +207,7 @@ public final class Server {
LOG.log(Level.WARNING, "Error occurred during LSP message dispatch", t);
if (t instanceof CompletionException) {
if (t.getCause() instanceof ResponseErrorException) {
- return ((ResponseErrorException)t).getResponseError();
+ return ((ResponseErrorException)t.getCause()).getResponseError();
}
Throwable cause = t.getCause();
ResponseError error = new ResponseError();
diff --git a/java/java.lsp.server/vscode/package-lock.json b/java/java.lsp.server/vscode/package-lock.json
index 8243353c86..7bd0d7017f 100644
--- a/java/java.lsp.server/vscode/package-lock.json
+++ b/java/java.lsp.server/vscode/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "apache-netbeans-java",
- "version": "19.0.301",
+ "version": "0.1.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "apache-netbeans-java",
- "version": "19.0.301",
+ "version": "0.1.0",
"license": "Apache 2.0",
"dependencies": {
"@vscode/debugadapter": "1.55.1",
diff --git a/java/java.lsp.server/vscode/src/nbcode.ts b/java/java.lsp.server/vscode/src/nbcode.ts
index 468cc7c446..8300a3750e 100644
--- a/java/java.lsp.server/vscode/src/nbcode.ts
+++ b/java/java.lsp.server/vscode/src/nbcode.ts
@@ -88,7 +88,7 @@ export function launch(
return process;
}
-if (typeof process === 'object' && process.argv0 === 'node') {
+if (typeof process === 'object' && typeof process.argv0 ==='string' && process.argv0.startsWith('node')) {
let extension = path.join(process.argv[1], '..', '..');
let nbcode = path.join(extension, 'nbcode');
if (!fs.existsSync(nbcode)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists