[netbeans] branch master updated: Fixing user home in project wizard and filtering outgoing messages from message consumer.

[pp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ppisl 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 cb09f1ec00 Fixing user home in project wizard and filtering outgoing messages from message consumer.
     new 4a26239f4d Merge pull request #3906 from ppisl/fix_userhome
cb09f1ec00 is described below

commit cb09f1ec00c1f85141995074e620d5da96f98c91
Author: Petr Pisl <pe...@oracle.com>
AuthorDate: Thu Mar 31 14:29:12 2022 +0200

    Fixing user home in project wizard and filtering outgoing messages from message consumer.
---
 .../org/netbeans/modules/java/lsp/server/protocol/LspTemplateUI.java  | 2 +-
 .../src/org/netbeans/modules/java/lsp/server/protocol/Server.java     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/LspTemplateUI.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/LspTemplateUI.java
index 134b355dae..e29fa9451c 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/LspTemplateUI.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/LspTemplateUI.java
@@ -224,7 +224,7 @@ final class LspTemplateUI {
     }
 
     private static String suggestWorkspaceRoot(List<WorkspaceFolder> folders) throws IllegalArgumentException {
-        String suggestion = System.getProperty("user.dir");
+        String suggestion = System.getProperty("user.home");
         if (folders != null && !folders.isEmpty()) try {
             suggestion = Utilities.toFile(new URI(folders.get(0).getUri())).getParent();
         } catch (URISyntaxException ex) {
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 ac7582a522..0da258c35c 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
@@ -72,6 +72,7 @@ import org.eclipse.lsp4j.TextDocumentSyncOptions;
 import org.eclipse.lsp4j.WorkDoneProgressCancelParams;
 import org.eclipse.lsp4j.WorkDoneProgressParams;
 import org.eclipse.lsp4j.WorkspaceFolder;
+import org.eclipse.lsp4j.jsonrpc.Endpoint;
 import org.eclipse.lsp4j.jsonrpc.JsonRpcException;
 import org.eclipse.lsp4j.jsonrpc.Launcher;
 import org.eclipse.lsp4j.jsonrpc.MessageConsumer;
@@ -195,6 +196,9 @@ public final class Server {
         public MessageConsumer attachLookup(MessageConsumer delegate) {
             // PENDING: allow for message consumer wrappers to be registered to add pre/post processing for
             // the request plus build the request's default Lookup contents.
+            if (!(delegate instanceof Endpoint)) {
+                return delegate; 
+            }
             return new MessageConsumer() {
                 @Override
                 public void consume(Message msg) throws MessageIssueException, JsonRpcException {


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