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

change prompt to 'In[...]' for ipython (PY-9171) and fix problem in indentation

Browse Source 
(cherry picked from commit ff89fbe)
This commit is contained in:
Alexander Marchuk
2014-03-22 18:07:58 +01:00
committed by Dmitry Trofimov
parent 60c3bffe5c
commit 7279e471c8
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/console/PyConsoleUtil.java
+1 -1
View File
@@ -112,7 +112,7 @@ public class PyConsoleUtil {
}
public static boolean detectIPythonImported(@NotNull String text, final ConsoleViewContentType outputType) {
return text.contains("PyDev console: using IPython 0.1") && outputType == ConsoleViewContentType.ERROR_OUTPUT;
return text.contains("PyDev console: using IPython ") && outputType == ConsoleViewContentType.ERROR_OUTPUT;
}
public static boolean detectSourcePrinting(@NotNull String text) {
python/src/com/jetbrains/python/console/PydevConsoleExecuteActionHandler.java
+31 -4
View File
@@ -53,6 +53,8 @@ public class PydevConsoleExecuteActionHandler extends ProcessBackedConsoleExecut
private final ConsoleCommunication myConsoleCommunication;
private boolean myEnabled = false;
private int myIpythonInputPromptCount = 1;
public PydevConsoleExecuteActionHandler(LanguageConsoleView consoleView,
ProcessHandler myProcessHandler,
ConsoleCommunication consoleCommunication) {
@@ -194,6 +196,9 @@ public class PydevConsoleExecuteActionHandler extends ProcessBackedConsoleExecut
private void sendLineToConsole(@NotNull final ConsoleCommunication.ConsoleCodeFragment code,
@NotNull final LanguageConsoleImpl console,
@NotNull final Editor currentEditor) {
if(!StringUtil.isEmptyOrSpaces(code.getText())) {
myIpythonInputPromptCount+=1;
}
if (myConsoleCommunication != null) {
final boolean waitedForInputBefore = myConsoleCommunication.isWaitingForInput();
if (myConsoleCommunication.isWaitingForInput()) {
@@ -225,7 +230,7 @@ public class PydevConsoleExecuteActionHandler extends ProcessBackedConsoleExecut
}
else {
if (!myConsoleCommunication.isWaitingForInput()) {
ordinaryPrompt(console, currentEditor);
inPrompt(console, currentEditor);
}
setCurrentIndentSize(0);
}
@@ -235,8 +240,9 @@ public class PydevConsoleExecuteActionHandler extends ProcessBackedConsoleExecut
});
// After requesting input we got no call back to change prompt, change it manually
if (waitedForInputBefore && !myConsoleCommunication.isWaitingForInput()) {
console.setPrompt(PyConsoleUtil.ORDINARY_PROMPT);
PyConsoleUtil.scrollDown(currentEditor);
myIpythonInputPromptCount-=1;
inPrompt(console, currentEditor);
setCurrentIndentSize(0);
}
}
}
@@ -246,7 +252,16 @@ public class PydevConsoleExecuteActionHandler extends ProcessBackedConsoleExecut
return lines[lines.length - 1];
}
private void inPrompt(LanguageConsoleImpl console, Editor currentEditor){
if(ipythonEnabled(console)){
ipythonInPrompt(console, currentEditor);
} else {
ordinaryPrompt(console, currentEditor);
}
}
private void ordinaryPrompt(LanguageConsoleImpl console, Editor currentEditor) {
if (!myConsoleCommunication.isExecuting()) {
if (!PyConsoleUtil.ORDINARY_PROMPT.equals(console.getPrompt())) {
console.setPrompt(PyConsoleUtil.ORDINARY_PROMPT);
@@ -258,6 +273,16 @@ public class PydevConsoleExecuteActionHandler extends ProcessBackedConsoleExecut
}
}
private boolean ipythonEnabled(LanguageConsoleImpl console){
return console.getFile().getVirtualFile() != null ?
PyConsoleUtil.getOrCreateIPythonData(console.getFile().getVirtualFile()).isIPythonEnabled() : false;
}
private void ipythonInPrompt(LanguageConsoleImpl console, Editor currentEditor){
console.setPrompt("In[" + myIpythonInputPromptCount + "]:");
PyConsoleUtil.scrollDown(currentEditor);
}
private static void executingPrompt(LanguageConsoleImpl console) {
console.setPrompt(PyConsoleUtil.EXECUTING_PROMPT);
}
@@ -279,7 +304,9 @@ public class PydevConsoleExecuteActionHandler extends ProcessBackedConsoleExecut
final LanguageConsoleImpl console = myConsoleView.getConsole();
final Editor currentEditor = console.getConsoleEditor();
ordinaryPrompt(console, currentEditor);
if(!ipythonEnabled(console)){
ordinaryPrompt(console, currentEditor);
}
}
}