You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by en...@apache.org on 2021/02/18 15:41:33 UTC
[netbeans] branch master updated: Completing the merge of delivery
to master.
This is an automated email from the ASF dual-hosted git repository.
entl 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 34c41d5 Completing the merge of delivery to master.
new 40a17f5 Merge pull request #2771 from entlicher/lspMergeComplete
34c41d5 is described below
commit 34c41d5ded527d65ffbf5f207ed99db53ffc666d
Author: Martin Entlicher <ma...@oracle.com>
AuthorDate: Thu Feb 18 11:29:15 2021 +0100
Completing the merge of delivery to master.
---
.../modules/java/lsp/server/protocol/Server.java | 5 +-
.../lsp/server/protocol/WorkspaceServiceImpl.java | 67 ----------------------
2 files changed, 1 insertion(+), 71 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 3723e66..d2b0251 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
@@ -323,8 +323,7 @@ public final class Server {
capabilities.setDocumentHighlightProvider(true);
capabilities.setReferencesProvider(true);
List<String> commands = new ArrayList<>(Arrays.asList(
- JAVA_BUILD_WORKSPACE, GRAALVM_PAUSE_SCRIPT, JAVA_SUPER_IMPLEMENTATION,
- JAVA_TEST_SINGLE_METHOD, JAVA_RUN_MAIN_METHOD));
+ JAVA_BUILD_WORKSPACE, GRAALVM_PAUSE_SCRIPT, JAVA_SUPER_IMPLEMENTATION));
for (CodeGenerator codeGenerator : Lookup.getDefault().lookupAll(CodeGenerator.class)) {
commands.addAll(codeGenerator.getCommands());
}
@@ -421,8 +420,6 @@ public final class Server {
public static final String JAVA_BUILD_WORKSPACE = "java.build.workspace";
public static final String JAVA_SUPER_IMPLEMENTATION = "java.super.implementation";
- public static final String JAVA_TEST_SINGLE_METHOD = "java.test.single.method";
- public static final String JAVA_RUN_MAIN_METHOD = "java.run.main.method";
public static final String GRAALVM_PAUSE_SCRIPT = "graalvm.pause.script";
static final String INDEXING_COMPLETED = "Indexing completed.";
static final String NO_JAVA_SUPPORT = "Cannot initialize Java support on JDK ";
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/WorkspaceServiceImpl.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/WorkspaceServiceImpl.java
index 787e2bb..587624f 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/WorkspaceServiceImpl.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/WorkspaceServiceImpl.java
@@ -121,33 +121,6 @@ public final class WorkspaceServiceImpl implements WorkspaceService, LanguageCli
String uri = ((JsonPrimitive) params.getArguments().get(0)).getAsString();
Position pos = gson.fromJson(gson.toJson(params.getArguments().get(1)), Position.class);
return (CompletableFuture)((TextDocumentServiceImpl)server.getTextDocumentService()).superImplementation(uri, pos);
- case Server.JAVA_TEST_SINGLE_METHOD:
- CommandProgress progressOfCommand = new CommandProgress();
- String uriStr = ((JsonPrimitive) params.getArguments().get(0)).getAsString();
- FileObject file;
- try {
- file = URLMapper.findFileObject(new URL(uriStr));
- } catch (MalformedURLException ex) {
- Exceptions.printStackTrace(ex);
- return CompletableFuture.completedFuture(true);
- }
- String methodName = ((JsonPrimitive) params.getArguments().get(1)).getAsString();
- SingleMethod method = new SingleMethod(file, methodName);
- runSingleMethodCommand(method, SingleMethod.COMMAND_RUN_SINGLE_METHOD, progressOfCommand);
- progressOfCommand.checkStatus();
- return progressOfCommand.getFinishFuture();
- case Server.JAVA_RUN_MAIN_METHOD:
- progressOfCommand = new CommandProgress();
- uriStr = ((JsonPrimitive) params.getArguments().get(0)).getAsString();
- try {
- file = URLMapper.findFileObject(new URL(uriStr));
- } catch (MalformedURLException ex) {
- Exceptions.printStackTrace(ex);
- return CompletableFuture.completedFuture(true);
- }
- runSingleFile(file, ActionProvider.COMMAND_RUN_SINGLE, progressOfCommand);
- progressOfCommand.checkStatus();
- return progressOfCommand.getFinishFuture();
default:
for (CodeGenerator codeGenerator : Lookup.getDefault().lookupAll(CodeGenerator.class)) {
if (codeGenerator.getCommands().contains(command)) {
@@ -158,46 +131,6 @@ public final class WorkspaceServiceImpl implements WorkspaceService, LanguageCli
throw new UnsupportedOperationException("Command not supported: " + params.getCommand());
}
- @NbBundle.Messages("No_Method_Found=No method found")
- private void runSingleMethodCommand(SingleMethod singleMethod, String command, CommandProgress progressOfCommand) {
- if (singleMethod == null) {
- StatusDisplayer.getDefault().setStatusText(Bundle.No_Method_Found());
- progressOfCommand.getFinishFuture().complete(true);
- } else {
- Mutex.EVENT.readAccess(new Runnable() {
- @Override
- public void run() {
- Project owner = FileOwnerQuery.getOwner(singleMethod.getFile());
- if (owner != null) {
- ActionProvider ap = owner.getLookup().lookup(ActionProvider.class);
- if (ap != null) {
- if (Arrays.asList(ap.getSupportedActions()).contains(command) && ap.isActionEnabled(command, Lookups.singleton(singleMethod))) {
- ap.invokeAction(command, Lookups.fixed(singleMethod, progressOfCommand));
- }
- }
- }
- }
- });
- }
- }
-
- private void runSingleFile(FileObject file, String command, CommandProgress progressOfCommand) {
- Mutex.EVENT.readAccess(new Runnable() {
- @Override
- public void run() {
- Project owner = FileOwnerQuery.getOwner(file);
- if (owner != null) {
- ActionProvider ap = owner.getLookup().lookup(ActionProvider.class);
- if (ap != null) {
- if (Arrays.asList(ap.getSupportedActions()).contains(command) && ap.isActionEnabled(command, Lookups.singleton(file))) {
- ap.invokeAction(command, Lookups.fixed(file, progressOfCommand));
- }
- }
- }
- }
- });
- }
-
@Override
public CompletableFuture<List<? extends SymbolInformation>> symbol(WorkspaceSymbolParams params) {
String query = params.getQuery();
---------------------------------------------------------------------
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