diff --git a/platform/lang-api/src/com/intellij/execution/BeforeRunTaskProvider.java b/platform/lang-api/src/com/intellij/execution/BeforeRunTaskProvider.java index 3d7e8ac0af25..e14209fed1af 100644 --- a/platform/lang-api/src/com/intellij/execution/BeforeRunTaskProvider.java +++ b/platform/lang-api/src/com/intellij/execution/BeforeRunTaskProvider.java @@ -1,4 +1,4 @@ -// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.execution; import com.intellij.execution.configurations.RunConfiguration; @@ -60,7 +60,6 @@ public abstract class BeforeRunTaskProvider { * @return {@code true} a promise returning true, if the task was changed */ public Promise configureTask(@NotNull DataContext context, @NotNull RunConfiguration configuration, @NotNull T task) { - //noinspection deprecation return Promises.resolvedPromise(configureTask(configuration, task)); } diff --git a/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java b/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java index 04ec96484d66..f4cbe947b463 100644 --- a/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java @@ -42,10 +42,10 @@ public final class ExecutorRegistryImpl extends ExecutorRegistry implements Disp public static final String RUN_CONTEXT_GROUP = "RunContextGroupInner"; private List myExecutors = new ArrayList<>(); - private final Map myId2Executor = new THashMap<>(); + private final Map myIdToExecutor = new THashMap<>(); private final Set myContextActionIdSet = new THashSet<>(); - private final Map myId2Action = new THashMap<>(); - private final Map myContextActionId2Action = new THashMap<>(); + private final Map myIdToAction = new THashMap<>(); + private final Map myContextActionIdToAction = new THashMap<>(); // [Project, ExecutorId, RunnerId] private final Set> myInProgress = Collections.synchronizedSet(new THashSet<>()); @@ -55,7 +55,7 @@ public final class ExecutorRegistryImpl extends ExecutorRegistry implements Disp } synchronized void initExecutor(@NotNull Executor executor) { - if (myId2Executor.get(executor.getId()) != null) { + if (myIdToExecutor.get(executor.getId()) != null) { LOG.error("Executor with id: \"" + executor.getId() + "\" was already registered!"); } @@ -66,25 +66,25 @@ public final class ExecutorRegistryImpl extends ExecutorRegistry implements Disp final AnAction toolbarAction; final AnAction runContextAction; if (executor instanceof ExecutorGroup) { - final ActionGroup toolbarActionGroup = new ExecutorGroupActionGroup((ExecutorGroup)executor, ExecutorAction::new); + final ActionGroup toolbarActionGroup = new ExecutorGroupActionGroup((ExecutorGroup)executor, ExecutorAction::new); toolbarActionGroup.setPopup(true); final Presentation presentation = toolbarActionGroup.getTemplatePresentation(); presentation.setIcon(executor.getIcon()); presentation.setText(executor.getStartActionText()); presentation.setDescription(executor.getDescription()); toolbarAction = toolbarActionGroup; - runContextAction = new ExecutorGroupActionGroup((ExecutorGroup)executor, RunContextAction::new); + runContextAction = new ExecutorGroupActionGroup((ExecutorGroup)executor, RunContextAction::new); } else { toolbarAction = new ExecutorAction(executor); runContextAction = new RunContextAction(executor); } final Executor.ActionWrapper customizer = executor.runnerActionsGroupExecutorActionCustomizer(); - registerAction(executor.getId(), customizer != null ? customizer.wrap(toolbarAction) : toolbarAction, RUNNERS_GROUP, myId2Action); - registerAction(executor.getContextActionId(), runContextAction, RUN_CONTEXT_GROUP, myContextActionId2Action); + registerAction(executor.getId(), customizer != null ? customizer.wrap(toolbarAction) : toolbarAction, RUNNERS_GROUP, myIdToAction); + registerAction(executor.getContextActionId(), runContextAction, RUN_CONTEXT_GROUP, myContextActionIdToAction); myExecutors.add(executor); - myId2Executor.put(executor.getId(), executor); + myIdToExecutor.put(executor.getId(), executor); myContextActionIdSet.add(executor.getContextActionId()); } @@ -102,11 +102,11 @@ public final class ExecutorRegistryImpl extends ExecutorRegistry implements Disp synchronized void deinitExecutor(@NotNull Executor executor) { myExecutors.remove(executor); - myId2Executor.remove(executor.getId()); + myIdToExecutor.remove(executor.getId()); myContextActionIdSet.remove(executor.getContextActionId()); - unregisterAction(executor.getId(), RUNNERS_GROUP, myId2Action); - unregisterAction(executor.getContextActionId(), RUN_CONTEXT_GROUP, myContextActionId2Action); + unregisterAction(executor.getId(), RUNNERS_GROUP, myIdToAction); + unregisterAction(executor.getContextActionId(), RUN_CONTEXT_GROUP, myContextActionIdToAction); } private static void unregisterAction(@NotNull String actionId, @NotNull String groupId, @NotNull Map map) { @@ -130,7 +130,7 @@ public final class ExecutorRegistryImpl extends ExecutorRegistry implements Disp @Override public Executor getExecutorById(final String executorId) { - return myId2Executor.get(executorId); + return myIdToExecutor.get(executorId); } private void init() { @@ -225,7 +225,7 @@ public final class ExecutorRegistryImpl extends ExecutorRegistry implements Disp return false; } } - final ProgramRunner runner = ProgramRunner.getRunner(myExecutor.getId(), configuration); + ProgramRunner runner = ProgramRunner.getRunner(myExecutor.getId(), configuration); if (runner == null || !ExecutionTargetManager.canRun(configuration, pair.getTarget()) || isStarting(project, myExecutor.getId(), runner.getRunnerId())) { @@ -365,7 +365,7 @@ public final class ExecutorRegistryImpl extends ExecutorRegistry implements Disp private final ExecutorGroup myExecutorGroup; private final Function myChildConverter; - private ExecutorGroupActionGroup(ExecutorGroup executorGroup, Function childConverter) { + private ExecutorGroupActionGroup(ExecutorGroup executorGroup, Function childConverter) { myExecutorGroup = executorGroup; myChildConverter = childConverter; } diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java index 2676835f926d..71caaa87b218 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java @@ -71,7 +71,7 @@ public abstract class ExecutionManagerImpl extends ExecutionManager implements D @Nullable RunnerAndConfigurationSettings configuration) { ExecutionEnvironmentBuilder builder = new ExecutionEnvironmentBuilder(project, executor); - ProgramRunner runner = ProgramRunnerUtil.getRunner(executor.getId(), configuration); + ProgramRunner runner = ProgramRunnerUtil.getRunner(executor.getId(), configuration); if (runner == null && configuration != null) { LOG.error("Cannot find runner for " + configuration.getName()); } diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerKtImpl.kt b/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerKtImpl.kt index 63dd89f077c6..96cbf16d3bab 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerKtImpl.kt +++ b/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerKtImpl.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.execution.impl import com.intellij.execution.ExecutionManager @@ -150,7 +150,7 @@ private class ProcessExecutionListener(private val project: Project, project.messageBus.syncPublisher(ExecutionManager.EXECUTION_TOPIC).processTerminated(executorId, environment, processHandler, event.exitCode) - SaveAndSyncHandler.getInstance()?.scheduleRefresh() + SaveAndSyncHandler.getInstance().scheduleRefresh() } override fun processWillTerminate(event: ProcessEvent, shouldNotBeUsed: Boolean) { diff --git a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TouchBarsManager.java b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TouchBarsManager.java index 5b30692d6b97..5c6ec1f1c19b 100644 --- a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TouchBarsManager.java +++ b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TouchBarsManager.java @@ -505,6 +505,7 @@ public final class TouchBarsManager { // System.out.println("ERROR: RunnersGroup for touchbar isn't a group"); return; } + final ActionGroup g = (ActionGroup)runButtons; for (Executor exec: ExecutorRegistry.getInstance().getRegisteredExecutors()) { if (exec != null && (exec.getId().equals(ToolWindowId.RUN) || exec.getId().equals(ToolWindowId.DEBUG))) {