MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Backspace unindent restored in Python console (PY-3005).

Browse Source
This commit is contained in:
Dmitry Trofimov
2011-03-31 14:19:07 +04:00
parent d55e8e1c54
commit 6172fdf2f5
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java
+9 -11
View File
@@ -135,7 +135,7 @@ public abstract class AbstractConsoleRunnerWithHistory {
new RunContentDescriptor(myConsoleView, myProcessHandler, panel, constructConsoleTitle(myConsoleTitle));
// tool bar actions
final AnAction[] actions = fillToolBarActions(toolbarActions, defaultExecutor, contentDescriptor);
final List<AnAction> actions = fillToolBarActions(toolbarActions, defaultExecutor, contentDescriptor);
registerActionShortcuts(actions, getLanguageConsole().getConsoleEditor().getComponent());
registerActionShortcuts(actions, panel);
panel.updateUI();
@@ -202,7 +202,7 @@ public abstract class AbstractConsoleRunnerWithHistory {
protected abstract OSProcessHandler createProcessHandler(final Process process, final String commandLine);
public static void registerActionShortcuts(final AnAction[] actions, final JComponent component) {
public static void registerActionShortcuts(final List<AnAction> actions, final JComponent component) {
for (AnAction action : actions) {
if (action.getShortcutSet() != null) {
action.registerCustomShortcutSet(action.getShortcutSet(), component);
@@ -210,9 +210,9 @@ public abstract class AbstractConsoleRunnerWithHistory {
}
}
protected AnAction[] fillToolBarActions(final DefaultActionGroup toolbarActions,
final Executor defaultExecutor,
final RunContentDescriptor contentDescriptor) {
protected List<AnAction> fillToolBarActions(final DefaultActionGroup toolbarActions,
final Executor defaultExecutor,
final RunContentDescriptor contentDescriptor) {
List<AnAction> actionList = Lists.newArrayList();
@@ -230,11 +230,9 @@ public abstract class AbstractConsoleRunnerWithHistory {
// Help
actionList.add(CommonActionsManager.getInstance().createHelpAction("interactive_console"));
AnAction[] actions = actionList.toArray(new AnAction[actionList.size()]);
toolbarActions.addAll(actionList);
toolbarActions.addAll(actions);
return actions;
return actionList;
}
protected AnAction createCloseAction(final Executor defaultExecutor, final RunContentDescriptor myDescriptor) {
@@ -250,8 +248,8 @@ public abstract class AbstractConsoleRunnerWithHistory {
}
public static AnAction createConsoleExecAction(final LanguageConsoleImpl languageConsole,
final ProcessHandler processHandler,
final ConsoleExecuteActionHandler consoleExecuteActionHandler) {
final ProcessHandler processHandler,
final ConsoleExecuteActionHandler consoleExecuteActionHandler) {
return new ConsoleExecuteAction(languageConsole, processHandler, consoleExecuteActionHandler);
}
platform/platform-api/src/com/intellij/openapi/actionSystem/DefaultActionGroup.java
+7
View File
@@ -20,6 +20,7 @@ import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collection;
import java.util.List;
/**
@@ -291,6 +292,12 @@ public class DefaultActionGroup extends ActionGroup {
}
}
public final void addAll(Collection<AnAction> actionList) {
for (AnAction each : actionList) {
add(each);
}
}
public final void addAll(AnAction... actions) {
for (AnAction each : actions) {
add(each);