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

PY-31168 Move Close action from Console toolbar to tab (to be consistent with Run tabs)

Browse Source
This commit is contained in:
Elizaveta Shashkova
2018-08-13 14:46:23 +03:00
parent 82e5fe2c9b
commit 33ed8a675f
2 changed files with 5 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ide/src/META-INF/pycharm-core.xml
+1 -3
View File
@@ -85,11 +85,9 @@
<!-- Console -->
<toolWindow id="Python Console" anchor="bottom" icon="PythonIcons.Python.PythonConsoleToolWindow"
<toolWindow id="Python Console" anchor="bottom" icon="PythonIcons.Python.PythonConsoleToolWindow" canCloseContents="true"
factoryClass="com.jetbrains.python.console.PythonConsoleToolWindowFactory" secondary="false"/>
<directoryIndexExcludePolicy implementation="com.jetbrains.python.PyDirectoryIndexExcludePolicy"/>
</extensions>
python/src/com/jetbrains/python/console/PydevConsoleRunnerImpl.java
+4 -47
View File
@@ -20,7 +20,6 @@ import com.intellij.execution.process.ProcessOutputTypes;
import com.intellij.execution.process.ProcessTerminatedListener;
import com.intellij.execution.runners.ConsoleTitleGen;
import com.intellij.execution.ui.RunContentDescriptor;
import com.intellij.execution.ui.actions.CloseAction;
import com.intellij.icons.AllIcons;
import com.intellij.ide.CommonActionsManager;
import com.intellij.ide.errorTreeView.NewErrorTreeViewPanel;
@@ -59,7 +58,6 @@ import com.intellij.testFramework.LightVirtualFile;
import com.intellij.ui.GuiUtils;
import com.intellij.ui.JBColor;
import com.intellij.ui.SideBorder;
import com.intellij.ui.content.Content;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Consumer;
import com.intellij.util.PathMappingSettings;
@@ -173,10 +171,7 @@ public class PydevConsoleRunnerImpl implements PydevConsoleRunner {
myConsoleTitle = consoleTitle;
}
private List<AnAction> fillToolBarActions(final DefaultActionGroup toolbarActions,
final RunContentDescriptor contentDescriptor) {
//toolbarActions.add(backspaceHandlingAction);
private List<AnAction> fillToolBarActions(final DefaultActionGroup toolbarActions) {
toolbarActions.add(createRerunAction());
List<AnAction> actions = ContainerUtil.newArrayList();
@@ -184,9 +179,6 @@ public class PydevConsoleRunnerImpl implements PydevConsoleRunner {
//stop
actions.add(createStopAction());
//close
actions.add(createCloseAction(contentDescriptor));
// run action
actions.add(
new ConsoleExecuteAction(myConsoleView, myConsoleExecuteActionHandler, myConsoleExecuteActionHandler.getEmptyExecuteAction(),
@@ -325,8 +317,6 @@ public class PydevConsoleRunnerImpl implements PydevConsoleRunner {
final RunContentDescriptor contentDescriptor =
new RunContentDescriptor(null, myProcessHandler, panel, "Error running console");
actionGroup.add(createCloseAction(contentDescriptor));
showContentDescriptor(contentDescriptor);
}
@@ -595,9 +585,8 @@ public class PydevConsoleRunnerImpl implements PydevConsoleRunner {
contentDescriptor.setFocusComputable(() -> myConsoleView.getConsoleEditor().getContentComponent());
contentDescriptor.setAutoFocusContent(true);
// tool bar actions
final List<AnAction> actions = fillToolBarActions(toolbarActions, contentDescriptor);
final List<AnAction> actions = fillToolBarActions(toolbarActions);
registerActionShortcuts(actions, myConsoleView.getConsoleEditor().getComponent());
registerActionShortcuts(actions, panel);
getConsoleView().addConsoleFolding(false, false);
@@ -688,7 +677,7 @@ public class PydevConsoleRunnerImpl implements PydevConsoleRunner {
@Override
public void actionPerformed(@NotNull AnActionEvent e) {
stopConsole(e);
stopConsole();
}
};
}
@@ -720,39 +709,8 @@ public class PydevConsoleRunnerImpl implements PydevConsoleRunner {
}
}
private AnAction createCloseAction(final RunContentDescriptor descriptor) {
final AnAction generalCloseAction = new CloseAction(getExecutor(), descriptor, myProject);
final AnAction stopAction = new DumbAwareAction() {
@Override
public void update(@NotNull AnActionEvent e) {
generalCloseAction.update(e);
}
@Override
public void actionPerformed(@NotNull AnActionEvent e) {
e = stopConsole(e);
clearContent(descriptor);
generalCloseAction.actionPerformed(e);
}
};
stopAction.copyFrom(generalCloseAction);
return stopAction;
}
protected void clearContent(RunContentDescriptor descriptor) {
PythonConsoleToolWindow toolWindow = PythonConsoleToolWindow.getInstance(myProject);
if (toolWindow != null && toolWindow.getToolWindow() != null) {
Content content = toolWindow.getToolWindow().getContentManager().findContent(descriptor.getDisplayName());
assert content != null;
toolWindow.getToolWindow().getContentManager().removeContent(content, true);
}
}
private AnActionEvent stopConsole(@NotNull AnActionEvent e) {
private void stopConsole() {
if (myPydevConsoleCommunication != null) {
e = new AnActionEvent(e.getInputEvent(), e.getDataContext(), e.getPlace(),
e.getPresentation(), e.getActionManager(), e.getModifiers());
try {
myPydevConsoleCommunication.interrupt();
closeCommunication();
@@ -763,7 +721,6 @@ public class PydevConsoleRunnerImpl implements PydevConsoleRunner {
// Ignore
}
}
return e;
}
protected AnAction createSplitLineAction() {