Address comments

Signed-off-by: sheche <[email protected]>

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/WorkspaceExecuteCommandHandler.java

@@ -13,7 +13,6 @@
 
 package org.eclipse.jdt.ls.core.internal.handlers;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -43,8 +42,6 @@
 import org.eclipse.lsp4j.jsonrpc.messages.ResponseError;
 import org.eclipse.lsp4j.jsonrpc.messages.ResponseErrorCode;
 
-import com.google.common.base.Objects;
-
 public class WorkspaceExecuteCommandHandler implements IRegistryEventListener {
 
 	private WorkspaceExecuteCommandHandler() {}
@@ -138,10 +135,16 @@ public static String createId(IConfigurationElement element) {
 	private Map<String, DelegateCommandHandlerDescriptor> fgContributedCommandHandlers;
 
 	private synchronized Collection<DelegateCommandHandlerDescriptor> getDelegateCommandHandlerDescriptors() {
-		if (fgContributedCommandHandlers == null) {
+		return getDelegateCommandHandlerDescriptors(false);
+	}
+
+	private synchronized Collection<DelegateCommandHandlerDescriptor> getDelegateCommandHandlerDescriptors(boolean force) {
+		if (fgContributedCommandHandlers == null || force) {
+
 			IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_POINT_ID);
 			fgContributedCommandHandlers = Stream.of(elements).collect(Collectors.toMap(DelegateCommandHandlerDescriptor::createId, DelegateCommandHandlerDescriptor::new, (value1, value2) -> value2));
 
+			Platform.getExtensionRegistry().removeListener(this);
 			Platform.getExtensionRegistry().addListener(this);
 		}
 
@@ -196,15 +199,9 @@ public Object executeCommand(ExecuteCommandParams params, IProgressMonitor monit
 		Collection<DelegateCommandHandlerDescriptor> candidates = handlers.stream().filter(desc -> desc.getAllCommands().contains(params.getCommand())).collect(Collectors.toSet()); //no cancellation here but it's super fast so it's ok.
 
 		if (candidates.isEmpty()) {
-			// fetch from the extension registry again in case that the local cache is out-of-sync.
-			IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_POINT_ID);
-			candidates = Stream.of(elements).filter(element -> {
-				IConfigurationElement[] commands = element.getChildren(COMMAND);
-				return Arrays.stream(commands).anyMatch(child -> {
-					String commandId = child.getAttribute(ID);
-					return Objects.equal(commandId, params.getCommand());
-				});
-			}).map(DelegateCommandHandlerDescriptor::new).collect(Collectors.toSet());
+			// re-fetch from the extension registry again in case that the local cache is out-of-sync.
+			handlers = getDelegateCommandHandlerDescriptors(true);
+			candidates = handlers.stream().filter(desc -> desc.getAllCommands().contains(params.getCommand())).collect(Collectors.toSet());
 		}
 
 		if (monitor.isCanceled()) {