Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fetch the extension registry again when delegate command handler not found #2184

Merged
merged 1 commit into from
Aug 11, 2022
Merged

Fetch the extension registry again when delegate command handler not found #2184

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 26 additions & 11 deletions ...ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/WorkspaceExecuteCommandHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2017-2018 Microsoft Corporation and others.
* Copyright (c) 2017-2022 Microsoft Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
Expand Down Expand Up @@ -44,13 +44,14 @@

public class WorkspaceExecuteCommandHandler implements IRegistryEventListener {

private static WorkspaceExecuteCommandHandler instance = null;
private WorkspaceExecuteCommandHandler() {}

private static class CommandHandlerHolder {
private static final WorkspaceExecuteCommandHandler instance = new WorkspaceExecuteCommandHandler();
}

public static WorkspaceExecuteCommandHandler getInstance() {
if (instance == null) {
instance = new WorkspaceExecuteCommandHandler();
}
return instance;
return CommandHandlerHolder.instance;
}

/**
Expand Down Expand Up @@ -134,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);
}

Expand Down Expand Up @@ -191,21 +198,29 @@ 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.size() > 1) {
Exception ex = new IllegalStateException(String.format("Found multiple delegateCommandHandlers (%s) matching command %s", candidates, params.getCommand()));
throw new ResponseErrorException(new ResponseError(ResponseErrorCode.InternalError, ex.getMessage(), ex));
if (candidates.isEmpty()) {
// 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()) {
return "";
}
if (candidates.size() > 1) {
Exception ex = new IllegalStateException(String.format("Found multiple delegateCommandHandlers (%s) matching command %s", candidates, params.getCommand()));
throw new ResponseErrorException(new ResponseError(ResponseErrorCode.InternalError, ex.getMessage(), ex));
}
if (candidates.isEmpty()) {
throw new ResponseErrorException(new ResponseError(ResponseErrorCode.MethodNotFound, String.format("No delegateCommandHandler for %s", params.getCommand()), null));
}

final DelegateCommandHandlerDescriptor descriptor = candidates.iterator().next();
final Object[] resultValues = new Object[1];
SafeRunner.run(new ISafeRunnable() {
@Override
public void run() throws Exception {
final IDelegateCommandHandler delegateCommandHandler = candidates.iterator().next().getDelegateCommandHandler();
final IDelegateCommandHandler delegateCommandHandler = descriptor.getDelegateCommandHandler();
if (delegateCommandHandler != null) {
//Convert args to java objects before sending to extensions
List<Object> args = Collections.emptyList();
Expand Down