You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jt...@apache.org on 2021/07/14 09:05:36 UTC

[netbeans] 01/01: Bringing PR-3050 into vsnetbeans_preview_1243 branch

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

jtulach pushed a commit to branch vsnetbeans_preview_1243
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit cd6bfbc00a8ae58191e3c442492aa9e4fd5137bb
Merge: 3570583 13a7abb
Author: Jaroslav Tulach <ja...@oracle.com>
AuthorDate: Wed Jul 14 11:05:17 2021 +0200

    Bringing PR-3050 into vsnetbeans_preview_1243 branch

 .../netbeans/modules/gradle/actions/ActionToTaskUtils.java   | 12 ++++++++++--
 .../java/lsp/server/debugging/launch/NbLaunchDelegate.java   |  6 +++---
 java/java.lsp.server/vscode/src/test/runTest.ts              |  2 +-
 java/java.lsp.server/vscode/src/test/suite/extension.test.ts |  2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --cc java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java
index ec98d29,c6304c0..fda979e
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java
@@@ -298,13 -290,8 +298,10 @@@ public abstract class NbLaunchDelegate 
                                  });
                              }
                          }
 -                    });
 +                    };
 +                    DebuggerManager.getDebuggerManager().addDebuggerListener(listener);
 +                    debuggerListeners.put(context, listener);
-                 } else {
-                     launchFuture.complete(null);
                  }
-                 
                  Lookups.executeWith(launchCtx, () -> {
                      providerAndCommand.first().invokeAction(providerAndCommand.second(), lookup);
  

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