From a443e0355da18f73c25796db331d07d8a2677922 Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Thu, 17 Nov 2011 10:32:41 +0100
Subject: [PATCH 1/2] IPython-specific parsing if only IPython is running
 (PY-4496).

---
 .../python/console/PyConsoleUtil.java         |  28 +++-
 .../python/console/PydevConsoleRunner.java    |   2 +-
 .../python/console/PythonConsoleView.java     |  20 ++-
 .../parsing/PyConsoleParsingContext.java      | 122 +++++++++++-------
 .../python/psi/PyFileElementType.java         |   2 +-
 5 files changed, 118 insertions(+), 56 deletions(-)

diff --git a/python/src/com/jetbrains/python/console/PyConsoleUtil.java b/python/src/com/jetbrains/python/console/PyConsoleUtil.java
index 065bd997d310..2046a794ef18 100644
--- a/python/src/com/jetbrains/python/console/PyConsoleUtil.java
+++ b/python/src/com/jetbrains/python/console/PyConsoleUtil.java
@@ -3,6 +3,8 @@ package com.jetbrains.python.console;
 import com.intellij.execution.console.LanguageConsoleImpl;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.util.Key;
+import com.intellij.openapi.vfs.VirtualFile;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
@@ -10,12 +12,12 @@ import org.jetbrains.annotations.NotNull;
  * @author traff
  */
 public class PyConsoleUtil {
-  public static final String ORDINARY_PROMPT =      ">>> ";
-  public static final String INPUT_PROMPT =      ">? ";
-  public static final String INDENT_PROMPT =        "... ";
-  static final String HELP_PROMPT =                 "help> ";
-  public static final String EXECUTING_PROMPT =      "";
-  
+  public static final String ORDINARY_PROMPT = ">>> ";
+  public static final String INPUT_PROMPT = ">? ";
+  public static final String INDENT_PROMPT = "... ";
+  static final String HELP_PROMPT = "help> ";
+  public static final String EXECUTING_PROMPT = "";
+
   private static final String IPYTHON_PAGING_PROMPT = "---Return to continue, q to quit---";
 
   static final String[] PROMPTS = new String[]{
@@ -26,6 +28,7 @@ public class PyConsoleUtil {
   };
   public static final String DOUBLE_QUOTE_MULTILINE = "\"\"\"";
   public static final String SINGLE_QUOTE_MULTILINE = "'''";
+  static final Key<Boolean> IPYTHON = Key.create("ipython");
 
   private PyConsoleUtil() {
   }
@@ -89,6 +92,10 @@ public class PyConsoleUtil {
     return isMultilineStarts(line, DOUBLE_QUOTE_MULTILINE);
   }
 
+  public static boolean detectIPythonImported(@NotNull String text) {
+    return text.contains("<--<ipython_imported>-->");
+  }
+
   public static boolean detectSourcePrinting(@NotNull String text) {
     return text.contains("Source:");
   }
@@ -100,5 +107,12 @@ public class PyConsoleUtil {
   public static boolean detectIPythonEnd(@NotNull String text) {
     return text.contains("<--<ipython_output_ends>-->");
   }
-
+  
+  public static boolean isIPythonDetected(VirtualFile file) {
+    if (file == null) {
+      return false;
+    }
+    Boolean detected = file.getUserData(IPYTHON);
+    return detected != null && detected.booleanValue();
+  }
 }
diff --git a/python/src/com/jetbrains/python/console/PydevConsoleRunner.java b/python/src/com/jetbrains/python/console/PydevConsoleRunner.java
index 2a9de07e94d6..2120abf72b38 100644
--- a/python/src/com/jetbrains/python/console/PydevConsoleRunner.java
+++ b/python/src/com/jetbrains/python/console/PydevConsoleRunner.java
@@ -42,6 +42,7 @@ import com.jetbrains.python.PythonHelpersLocator;
 import com.jetbrains.python.console.completion.PydevConsoleElement;
 import com.jetbrains.python.console.pydev.ConsoleCommunication;
 import com.jetbrains.python.console.pydev.PydevConsoleCommunication;
+import com.jetbrains.python.psi.resolve.ResolveImportUtil;
 import com.jetbrains.python.run.PythonCommandLineState;
 import com.jetbrains.python.run.PythonTracebackFilter;
 import com.jetbrains.python.sdk.PythonSdkFlavor;
@@ -429,7 +430,6 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
     return false;
   }
 
-
   @Nullable
   public static ConsoleCommunication getConsoleCommunication(final PsiElement element) {
     return element.getContainingFile().getCopyableUserData(CONSOLE_KEY);
diff --git a/python/src/com/jetbrains/python/console/PythonConsoleView.java b/python/src/com/jetbrains/python/console/PythonConsoleView.java
index aea4517b7b6c..616597db46c4 100644
--- a/python/src/com/jetbrains/python/console/PythonConsoleView.java
+++ b/python/src/com/jetbrains/python/console/PythonConsoleView.java
@@ -33,6 +33,7 @@ import org.jetbrains.annotations.Nullable;
  * @author traff
  */
 public class PythonConsoleView extends LanguageConsoleViewImpl implements PyCodeExecutor {
+
   private static final Logger LOG = Logger.getInstance(PythonConsoleView.class);
 
   private Project myProject;
@@ -50,7 +51,8 @@ public class PythonConsoleView extends LanguageConsoleViewImpl implements PyCode
     setUpdateFoldingsEnabled(false);
     myProject = project;
     //noinspection ConstantConditions
-    myPyHighlighter = new PyHighlighter(sdk != null && sdk.getVersionString() != null ? LanguageLevel.fromPythonVersion(sdk.getVersionString()) : LanguageLevel.getDefault());
+    myPyHighlighter = new PyHighlighter(
+      sdk != null && sdk.getVersionString() != null ? LanguageLevel.fromPythonVersion(sdk.getVersionString()) : LanguageLevel.getDefault());
     myScheme = getPythonLanguageConsole().getConsoleEditor().getColorsScheme();
   }
 
@@ -70,6 +72,10 @@ public class PythonConsoleView extends LanguageConsoleViewImpl implements PyCode
     return ((PythonLanguageConsole)myConsole);
   }
 
+  public LanguageConsoleImpl getLanguageConsole() {
+    return myConsole;
+  }
+
   @Override
   public void executeCode(final @NotNull String code) {
     ProgressManager.getInstance().run(new Task.Backgroundable(null, "Executing code in console...", false) {
@@ -113,7 +119,10 @@ public class PythonConsoleView extends LanguageConsoleViewImpl implements PyCode
   }
 
   public void printText(String text, final Key attributes) {
-    if (PyConsoleUtil.detectIPythonEnd(text)) {
+    if (PyConsoleUtil.detectIPythonImported(text)) {
+      setIPythonDetected();
+    }
+    else if (PyConsoleUtil.detectIPythonEnd(text)) {
       myIsIPythonOutput = false;
       mySourceHighlighter = null;
     }
@@ -145,6 +154,13 @@ public class PythonConsoleView extends LanguageConsoleViewImpl implements PyCode
     }
   }
 
+  private void setIPythonDetected() {
+    VirtualFile file = getConsole().getFile().getVirtualFile();
+    if (file != null) {
+      file.putUserData(PyConsoleUtil.IPYTHON, Boolean.TRUE);
+    }
+  }
+
   private boolean detectHyperlink(@NotNull String text, @NotNull Key attributes) {
     return myIsIPythonOutput && text.startsWith("File:");
   }
diff --git a/python/src/com/jetbrains/python/console/parsing/PyConsoleParsingContext.java b/python/src/com/jetbrains/python/console/parsing/PyConsoleParsingContext.java
index 6b07c9c4571e..529d3e5d7ec4 100644
--- a/python/src/com/jetbrains/python/console/parsing/PyConsoleParsingContext.java
+++ b/python/src/com/jetbrains/python/console/parsing/PyConsoleParsingContext.java
@@ -1,8 +1,12 @@
 package com.jetbrains.python.console.parsing;
 
 import com.intellij.lang.PsiBuilder;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiElement;
+import com.intellij.testFramework.LightVirtualFile;
 import com.jetbrains.python.PyElementTypes;
 import com.jetbrains.python.PyTokenTypes;
+import com.jetbrains.python.console.PyConsoleUtil;
 import com.jetbrains.python.parsing.ExpressionParsing;
 import com.jetbrains.python.parsing.ParsingContext;
 import com.jetbrains.python.parsing.ParsingScope;
@@ -16,11 +20,24 @@ import org.jetbrains.annotations.Nullable;
 public class PyConsoleParsingContext extends ParsingContext {
   private final StatementParsing stmtParser;
   private final ExpressionParsing expressionParser;
+  private final VirtualFile myConsoleFile;
 
-  public PyConsoleParsingContext(final PsiBuilder builder, LanguageLevel languageLevel, StatementParsing.FUTURE futureFlag) {
+  public PyConsoleParsingContext(final PsiBuilder builder,
+                                 LanguageLevel languageLevel,
+                                 StatementParsing.FUTURE futureFlag,
+                                 PsiElement psi) {
     super(builder, languageLevel, futureFlag);
-    stmtParser = new ConsoleStatementParsing(this, futureFlag);
-    expressionParser = new ConsoleExpressionParsing(this);
+    myConsoleFile = getConsoleFile(psi);
+    stmtParser = new ConsoleStatementParsing(this, futureFlag, myConsoleFile);
+    expressionParser = new ConsoleExpressionParsing(this, myConsoleFile);
+  }
+
+  private static VirtualFile getConsoleFile(PsiElement psi) {
+    VirtualFile file = psi.getContainingFile().getViewProvider().getVirtualFile();
+    if (file instanceof LightVirtualFile) {
+      file = ((LightVirtualFile)file).getOriginalFile();
+    }
+    return file;
   }
 
   @Override
@@ -34,72 +51,87 @@ public class PyConsoleParsingContext extends ParsingContext {
   }
 
   private static class ConsoleStatementParsing extends StatementParsing {
-    protected ConsoleStatementParsing(ParsingContext context, @Nullable FUTURE futureFlag) {
+    private final VirtualFile myConsoleFile;
+
+    protected ConsoleStatementParsing(ParsingContext context, @Nullable FUTURE futureFlag, VirtualFile file) {
       super(context, futureFlag);
+      myConsoleFile = file;
     }
 
     protected void checkEndOfStatement(ParsingScope scope) {
-      PsiBuilder builder = myContext.getBuilder();
-      if (builder.getTokenType() == PyTokenTypes.STATEMENT_BREAK) {
-        builder.advanceLexer();
-      }
-      else if (builder.getTokenType() == PyTokenTypes.SEMICOLON) {
-        if (!scope.isSuite()) {
-          builder.advanceLexer();
-          if (builder.getTokenType() == PyTokenTypes.STATEMENT_BREAK) {
-            builder.advanceLexer();
-          }
-        }
-      }
-      else if (builder.eof()) {
-        return;
+      if (!PyConsoleUtil.isIPythonDetected(myConsoleFile)) {
+        super.checkEndOfStatement(scope);
       }
       else {
-        if (builder.getTokenType() == PyConsoleTokenTypes.PLING || builder.getTokenType() == PyConsoleTokenTypes.QUESTION_MARK) {
+        PsiBuilder builder = myContext.getBuilder();
+        if (builder.getTokenType() == PyTokenTypes.STATEMENT_BREAK) {
           builder.advanceLexer();
-          if (builder.getTokenType() == PyConsoleTokenTypes.PLING || builder.getTokenType() == PyConsoleTokenTypes.QUESTION_MARK) {
+        }
+        else if (builder.getTokenType() == PyTokenTypes.SEMICOLON) {
+          if (!scope.isSuite()) {
             builder.advanceLexer();
+            if (builder.getTokenType() == PyTokenTypes.STATEMENT_BREAK) {
+              builder.advanceLexer();
+            }
           }
-
+        }
+        else if (builder.eof()) {
           return;
         }
-        builder.error("end of statement expected");
+        else {
+          if (builder.getTokenType() == PyConsoleTokenTypes.PLING || builder.getTokenType() == PyConsoleTokenTypes.QUESTION_MARK) {
+            builder.advanceLexer();
+            if (builder.getTokenType() == PyConsoleTokenTypes.PLING || builder.getTokenType() == PyConsoleTokenTypes.QUESTION_MARK) {
+              builder.advanceLexer();
+            }
+
+            return;
+          }
+          builder.error("end of statement expected");
+        }
       }
     }
   }
 
   private static class ConsoleExpressionParsing extends ExpressionParsing {
+    private final VirtualFile myConsoleFile;
 
-    public ConsoleExpressionParsing(ParsingContext context) {
+    public ConsoleExpressionParsing(ParsingContext context, VirtualFile file) {
       super(context);
+      myConsoleFile = file;
     }
 
     @Override
     public boolean parseExpressionOptional() {
-      if (myBuilder.getTokenType() == PyTokenTypes.PERC || myBuilder.getTokenType() == PyConsoleTokenTypes.PLING) {
-        PsiBuilder.Marker expr = myBuilder.mark();
-        PsiBuilder.Marker command = myBuilder.mark();
-
-        myBuilder.advanceLexer();
-
-        if (myBuilder.getTokenType() == PyTokenTypes.IDENTIFIER) {
-          myBuilder.advanceLexer();
-          command.done(PyElementTypes.REFERENCE_EXPRESSION);
-        }
-        else {
-          expr.drop();
-          command.drop();
-          myBuilder.error("Identifier expected.");
-          return false;
-        }
-        while (myBuilder.getTokenType() != null) {
-          myBuilder.advanceLexer();
-        }
-        expr.done(PyElementTypes.EMPTY_EXPRESSION);
-        return true;
+      if (!PyConsoleUtil.isIPythonDetected(myConsoleFile)) {
+        return super.parseExpressionOptional();
       }
       else {
-        return super.parseExpressionOptional();
+        if (myBuilder.getTokenType() == PyTokenTypes.PERC || myBuilder.getTokenType() == PyConsoleTokenTypes.PLING) {
+          PsiBuilder.Marker expr = myBuilder.mark();
+          PsiBuilder.Marker command = myBuilder.mark();
+
+          myBuilder.advanceLexer();
+
+          if (myBuilder.getTokenType() == PyTokenTypes.IDENTIFIER) {
+            myBuilder.advanceLexer();
+            command.done(PyElementTypes.REFERENCE_EXPRESSION);
+          }
+          else {
+            expr.drop();
+            command.drop();
+            myBuilder.error("Identifier expected.");
+            return false;
+          }
+          while (myBuilder.getTokenType() != null) {
+            myBuilder.advanceLexer();
+          }
+          expr.done(PyElementTypes.EMPTY_EXPRESSION);
+          return true;
+        }
+        else {
+          return super.parseExpressionOptional();
+        }
       }
     }
   }
diff --git a/python/src/com/jetbrains/python/psi/PyFileElementType.java b/python/src/com/jetbrains/python/psi/PyFileElementType.java
index 5330c554e6f0..2a5430ff5611 100644
--- a/python/src/com/jetbrains/python/psi/PyFileElementType.java
+++ b/python/src/com/jetbrains/python/psi/PyFileElementType.java
@@ -85,7 +85,7 @@ public class PyFileElementType extends IStubFileElementType<PyFileStub> {
       final PyParser parser = new PyParser() {
         @Override
         protected ParsingContext createParsingContext(PsiBuilder builder, LanguageLevel languageLevel, StatementParsing.FUTURE futureFlag) {
-          return new PyConsoleParsingContext(builder, languageLevel, futureFlag);
+          return new PyConsoleParsingContext(builder, languageLevel, futureFlag, psi);
         }
       };
       return parser.parse(this, builder).getFirstChildNode();

From d16b390f88fff8b634f522b9e32970300701d3c6 Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Thu, 17 Nov 2011 14:48:55 +0100
Subject: [PATCH 2/2] IPython console embedded to debug console (PY-4504).

---
 python/helpers/pydev/pydevd_vars.py           |   7 +-
 .../console/PyConsoleProcessHandler.java      |   2 +-
 ...r.java => PyConsoleSourceHighlighter.java} |   6 +-
 .../python/console/PyConsoleUtil.java         |  10 +-
 .../python/console/PydevConsoleRunner.java    |  25 ++--
 .../python/console/PythonConsoleView.java     |  42 ++++---
 .../PythonDebugLanguageConsoleView.java       |  10 +-
 .../parsing/PyConsoleParsingContext.java      | 107 +++++++-----------
 .../python/psi/PyFileElementType.java         |   2 +-
 9 files changed, 108 insertions(+), 103 deletions(-)
 rename python/src/com/jetbrains/python/console/{ConsoleSourceHighlighter.java => PyConsoleSourceHighlighter.java} (90%)

diff --git a/python/helpers/pydev/pydevd_vars.py b/python/helpers/pydev/pydevd_vars.py
index 166e517aa791..103f300eef20 100644
--- a/python/helpers/pydev/pydevd_vars.py
+++ b/python/helpers/pydev/pydevd_vars.py
@@ -7,6 +7,7 @@ from pydevd_constants import * #@UnusedWildImport
 from types import * #@UnusedWildImport
 from code import compile_command
 from code import InteractiveInterpreter
+from console import pydevconsole
 
 try:
     from StringIO import StringIO
@@ -464,6 +465,9 @@ def consoleExec(thread_id, frame_id, expression):
     updated_globals.update(frame.f_globals)
     updated_globals.update(frame.f_locals) #locals later because it has precedence over the actual globals
 
+    if pydevconsole.IPYTHON:
+        return pydevconsole.exec_expression(expression, updated_globals, frame.f_locals)
+
     interpreter = ConsoleWriter()
 
     try:
@@ -477,7 +481,8 @@ def consoleExec(thread_id, frame_id, expression):
         # Case 2
         return True
 
-    # Case 3
+    #Case 3
+
     try:
         Exec(code, updated_globals, frame.f_locals)
 
diff --git a/python/src/com/jetbrains/python/console/PyConsoleProcessHandler.java b/python/src/com/jetbrains/python/console/PyConsoleProcessHandler.java
index 6a17cd1ff54c..9eb494998f0a 100644
--- a/python/src/com/jetbrains/python/console/PyConsoleProcessHandler.java
+++ b/python/src/com/jetbrains/python/console/PyConsoleProcessHandler.java
@@ -29,7 +29,7 @@ public class PyConsoleProcessHandler extends PythonProcessHandler {
   protected void textAvailable(final String text, final Key attributes) {
     final String string = PyConsoleUtil.processPrompts(getConsole(), StringUtil.convertLineSeparators(text));
 
-    myConsoleView.printText(string, attributes);
+    myConsoleView.print(string, attributes);
   }
 
   @Override
diff --git a/python/src/com/jetbrains/python/console/ConsoleSourceHighlighter.java b/python/src/com/jetbrains/python/console/PyConsoleSourceHighlighter.java
similarity index 90%
rename from python/src/com/jetbrains/python/console/ConsoleSourceHighlighter.java
rename to python/src/com/jetbrains/python/console/PyConsoleSourceHighlighter.java
index 4d4adf0ce518..9be9edb8e49c 100644
--- a/python/src/com/jetbrains/python/console/ConsoleSourceHighlighter.java
+++ b/python/src/com/jetbrains/python/console/PyConsoleSourceHighlighter.java
@@ -12,7 +12,7 @@ import com.jetbrains.python.highlighting.PyHighlighter;
 /**
 * @author traff
 */
-class ConsoleSourceHighlighter {
+class PyConsoleSourceHighlighter {
   private final Lexer myLexer;
 
   private final EditorColorsScheme myScheme;
@@ -21,7 +21,7 @@ class ConsoleSourceHighlighter {
   private int myLexerState;
   private PythonConsoleView myPythonConsoleView;
 
-  ConsoleSourceHighlighter(PythonConsoleView pythonConsoleView, EditorColorsScheme scheme, PyHighlighter pyHighlighter) {
+  PyConsoleSourceHighlighter(PythonConsoleView pythonConsoleView, EditorColorsScheme scheme, PyHighlighter pyHighlighter) {
     myPythonConsoleView = pythonConsoleView;
     myScheme = scheme;
     myPyHighlighter = pyHighlighter;
@@ -32,7 +32,7 @@ class ConsoleSourceHighlighter {
     myLexer.start(text, 0, text.length(), getLexerState());
     while (hasNext()) {
       Pair<String, ConsoleViewContentType> pair = next();
-      myPythonConsoleView.print(pair.first, pair.second);
+      myPythonConsoleView.printText(pair.first, pair.second);
     }
   }
 
diff --git a/python/src/com/jetbrains/python/console/PyConsoleUtil.java b/python/src/com/jetbrains/python/console/PyConsoleUtil.java
index 2046a794ef18..8e43a7b410ac 100644
--- a/python/src/com/jetbrains/python/console/PyConsoleUtil.java
+++ b/python/src/com/jetbrains/python/console/PyConsoleUtil.java
@@ -1,6 +1,8 @@
 package com.jetbrains.python.console;
 
 import com.intellij.execution.console.LanguageConsoleImpl;
+import com.intellij.execution.process.ProcessOutputTypes;
+import com.intellij.execution.ui.ConsoleViewContentType;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.util.Key;
@@ -92,8 +94,8 @@ public class PyConsoleUtil {
     return isMultilineStarts(line, DOUBLE_QUOTE_MULTILINE);
   }
 
-  public static boolean detectIPythonImported(@NotNull String text) {
-    return text.contains("<--<ipython_imported>-->");
+  public static boolean detectIPythonImported(@NotNull String text, final ConsoleViewContentType outputType) {
+    return text.contains("PyDev console: using IPython 0.1") && outputType == ConsoleViewContentType.ERROR_OUTPUT;
   }
 
   public static boolean detectSourcePrinting(@NotNull String text) {
@@ -101,11 +103,11 @@ public class PyConsoleUtil {
   }
 
   public static boolean detectIPythonStart(@NotNull String text) {
-    return text.contains("<--<ipython_output_starts>-->");
+    return text.contains("IPython-->");
   }
 
   public static boolean detectIPythonEnd(@NotNull String text) {
-    return text.contains("<--<ipython_output_ends>-->");
+    return text.contains("<--IPython");
   }
   
   public static boolean isIPythonDetected(VirtualFile file) {
diff --git a/python/src/com/jetbrains/python/console/PydevConsoleRunner.java b/python/src/com/jetbrains/python/console/PydevConsoleRunner.java
index 2120abf72b38..cdf33031ac89 100644
--- a/python/src/com/jetbrains/python/console/PydevConsoleRunner.java
+++ b/python/src/com/jetbrains/python/console/PydevConsoleRunner.java
@@ -33,7 +33,9 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.CharsetToolkit;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
 import com.intellij.psi.impl.source.tree.FileElement;
+import com.intellij.testFramework.LightVirtualFile;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.IJSwingUtilities;
 import com.intellij.util.net.NetUtils;
@@ -242,7 +244,7 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
           myProcessHandler.addProcessListener(new ProcessAdapter() {
             @Override
             public void onTextAvailable(ProcessEvent event, Key outputType) {
-              consoleView.printText(event.getText(), outputType);
+              consoleView.print(event.getText(), outputType);
             }
           });
 
@@ -259,7 +261,7 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
       });
     }
     else {
-      getConsoleView().printText("Couldn't connect to console process.", ProcessOutputTypes.STDERR);
+      getConsoleView().print("Couldn't connect to console process.", ProcessOutputTypes.STDERR);
       myProcessHandler.destroyProcess();
       finishConsole();
     }
@@ -270,7 +272,7 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
       @Override
       public void actionPerformed(final AnActionEvent e) {
         if (myPydevConsoleCommunication.isExecuting()) {
-          getConsoleView().printText("^C", ProcessOutputTypes.SYSTEM);
+          getConsoleView().print("^C", ProcessOutputTypes.SYSTEM);
         }
         myPydevConsoleCommunication.interrupt();
       }
@@ -418,16 +420,23 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
     return file.getName().contains("Python Console");
   }
 
-  public static boolean isInPydevConsole(final FileElement element) {
+  public static boolean isIPythonConsole(final FileElement element) {
     //noinspection ConstantConditions
     if (element.getPsi() == null || element.getPsi().getContainingFile() == null) {
       return false;
     }
-    //noinspection ConstantConditions
-    if ("Python Console".equals(element.getPsi().getContainingFile().getName())) {
-      return true;
+
+    VirtualFile file = getConsoleFile(element.getPsi().getContainingFile());
+
+    return PyConsoleUtil.isIPythonDetected(file);
+  }
+
+  private static VirtualFile getConsoleFile(PsiFile psiFile) {
+    VirtualFile file = psiFile.getViewProvider().getVirtualFile();
+    if (file instanceof LightVirtualFile) {
+      file = ((LightVirtualFile)file).getOriginalFile();
     }
-    return false;
+    return file;
   }
 
   @Nullable
diff --git a/python/src/com/jetbrains/python/console/PythonConsoleView.java b/python/src/com/jetbrains/python/console/PythonConsoleView.java
index 616597db46c4..bed7eb2853d2 100644
--- a/python/src/com/jetbrains/python/console/PythonConsoleView.java
+++ b/python/src/com/jetbrains/python/console/PythonConsoleView.java
@@ -38,7 +38,7 @@ public class PythonConsoleView extends LanguageConsoleViewImpl implements PyCode
 
   private Project myProject;
   private PydevConsoleExecuteActionHandler myExecuteActionHandler;
-  private ConsoleSourceHighlighter mySourceHighlighter;
+  private PyConsoleSourceHighlighter mySourceHighlighter;
   private boolean myIsIPythonOutput = false;
   private PyHighlighter myPyHighlighter;
   private EditorColorsScheme myScheme;
@@ -114,15 +114,21 @@ public class PythonConsoleView extends LanguageConsoleViewImpl implements PyCode
   }
 
   public void executeStatement(@NotNull String statement, @NotNull final Key attributes) {
-    printText(statement, attributes);
+    print(statement, outputTypeForAttributes(attributes));
     myExecuteActionHandler.processLine(statement, true);
   }
 
-  public void printText(String text, final Key attributes) {
-    if (PyConsoleUtil.detectIPythonImported(text)) {
-      setIPythonDetected();
-    }
-    else if (PyConsoleUtil.detectIPythonEnd(text)) {
+  public void print(String text,  @NotNull final Key attributes) {
+    print(text, outputTypeForAttributes(attributes));
+  }
+
+  public void printText(String text, final ConsoleViewContentType outputType) {
+    super.print(text, outputType);
+  }
+
+  public void print(String text, final ConsoleViewContentType outputType) {
+    detectIPython(text, outputType);
+    if (PyConsoleUtil.detectIPythonEnd(text)) {
       myIsIPythonOutput = false;
       mySourceHighlighter = null;
     }
@@ -130,17 +136,17 @@ public class PythonConsoleView extends LanguageConsoleViewImpl implements PyCode
       myIsIPythonOutput = true;
     }
     else {
-      if (mySourceHighlighter == null || attributes == ProcessOutputTypes.STDERR) {
+      if (mySourceHighlighter == null || outputType == ConsoleViewContentType.ERROR_OUTPUT) {
         if (myHyperlink) {
-          printHyperlink(text, attributes);
+          printHyperlink(text, outputType);
         }
         else {
           //Print text normally with converted attributes
-          print(text, outputTypeForAttributes(attributes));
+          super.print(text, outputType);
         }
-        myHyperlink = detectHyperlink(text, attributes);
+        myHyperlink = detectHyperlink(text);
         if (mySourceHighlighter == null && myIsIPythonOutput && PyConsoleUtil.detectSourcePrinting(text)) {
-          mySourceHighlighter = new ConsoleSourceHighlighter(this, myScheme, myPyHighlighter);
+          mySourceHighlighter = new PyConsoleSourceHighlighter(this, myScheme, myPyHighlighter);
         }
       }
       else {
@@ -154,6 +160,12 @@ public class PythonConsoleView extends LanguageConsoleViewImpl implements PyCode
     }
   }
 
+  public void detectIPython(String text, final ConsoleViewContentType outputType) {
+    if (PyConsoleUtil.detectIPythonImported(text, outputType)) {
+      setIPythonDetected();
+    }
+  }
+
   private void setIPythonDetected() {
     VirtualFile file = getConsole().getFile().getVirtualFile();
     if (file != null) {
@@ -161,11 +173,11 @@ public class PythonConsoleView extends LanguageConsoleViewImpl implements PyCode
     }
   }
 
-  private boolean detectHyperlink(@NotNull String text, @NotNull Key attributes) {
+  private boolean detectHyperlink(@NotNull String text) {
     return myIsIPythonOutput && text.startsWith("File:");
   }
 
-  private void printHyperlink(@NotNull String text, @NotNull Key attributes) {
+  private void printHyperlink(@NotNull String text, @NotNull ConsoleViewContentType contentType) {
     if (!StringUtil.isEmpty(text)) {
       VirtualFile vFile = LocalFileSystem.getInstance().findFileByPath(text.trim());
 
@@ -175,7 +187,7 @@ public class PythonConsoleView extends LanguageConsoleViewImpl implements PyCode
         printHyperlink(text, hyperlink);
       }
       else {
-        print(text, outputTypeForAttributes(attributes));
+        super.print(text, contentType);
       }
     }
   }
diff --git a/python/src/com/jetbrains/python/console/PythonDebugLanguageConsoleView.java b/python/src/com/jetbrains/python/console/PythonDebugLanguageConsoleView.java
index cc3fc40c8037..af5a925b4204 100644
--- a/python/src/com/jetbrains/python/console/PythonDebugLanguageConsoleView.java
+++ b/python/src/com/jetbrains/python/console/PythonDebugLanguageConsoleView.java
@@ -51,7 +51,7 @@ public class PythonDebugLanguageConsoleView extends JPanel implements ConsoleVie
 
     add(myTextConsole.getComponent(), TEXT_CONSOLE_PANEL);
     add(myPydevConsoleView.getComponent(), PYDEV_CONSOLE_PANEL);
-    
+
     showDebugConsole(PyConsoleOptionsProvider.getInstance(project).isShowDebugConsoleByDefault());
   }
 
@@ -66,7 +66,7 @@ public class PythonDebugLanguageConsoleView extends JPanel implements ConsoleVie
   }
 
   private static PythonConsoleView createConsoleView(Project project, Sdk sdk) {
-    return new PythonConsoleView(project, "",  sdk);
+    return new PythonConsoleView(project, "Python Console", sdk);
   }
 
   private void doShowConsole(String type) {
@@ -95,8 +95,9 @@ public class PythonDebugLanguageConsoleView extends JPanel implements ConsoleVie
   }
 
   public ConsoleViewImpl getTextConsole() {
-    if (myTextConsole instanceof ConsoleViewImpl)
+    if (myTextConsole instanceof ConsoleViewImpl) {
       return (ConsoleViewImpl)myTextConsole;
+    }
     return null;
   }
 
@@ -206,8 +207,9 @@ public class PythonDebugLanguageConsoleView extends JPanel implements ConsoleVie
   @Override
   public void addChangeListener(ChangeListener listener, Disposable parent) {
     myPydevConsoleView.addChangeListener(listener, parent);
-    if (myTextConsole instanceof ObservableConsoleView)
+    if (myTextConsole instanceof ObservableConsoleView) {
       ((ObservableConsoleView)myTextConsole).addChangeListener(listener, parent);
+    }
   }
 
   private static class ShowDebugConsoleAction extends ToggleAction implements DumbAware {
diff --git a/python/src/com/jetbrains/python/console/parsing/PyConsoleParsingContext.java b/python/src/com/jetbrains/python/console/parsing/PyConsoleParsingContext.java
index 529d3e5d7ec4..f7480d3693e4 100644
--- a/python/src/com/jetbrains/python/console/parsing/PyConsoleParsingContext.java
+++ b/python/src/com/jetbrains/python/console/parsing/PyConsoleParsingContext.java
@@ -20,24 +20,14 @@ import org.jetbrains.annotations.Nullable;
 public class PyConsoleParsingContext extends ParsingContext {
   private final StatementParsing stmtParser;
   private final ExpressionParsing expressionParser;
-  private final VirtualFile myConsoleFile;
 
   public PyConsoleParsingContext(final PsiBuilder builder,
                                  LanguageLevel languageLevel,
                                  StatementParsing.FUTURE futureFlag,
                                  PsiElement psi) {
     super(builder, languageLevel, futureFlag);
-    myConsoleFile = getConsoleFile(psi);
-    stmtParser = new ConsoleStatementParsing(this, futureFlag, myConsoleFile);
-    expressionParser = new ConsoleExpressionParsing(this, myConsoleFile);
-  }
-
-  private static VirtualFile getConsoleFile(PsiElement psi) {
-    VirtualFile file = psi.getContainingFile().getViewProvider().getVirtualFile();
-    if (file instanceof LightVirtualFile) {
-      file = ((LightVirtualFile)file).getOriginalFile();
-    }
-    return file;
+    stmtParser = new ConsoleStatementParsing(this, futureFlag);
+    expressionParser = new ConsoleExpressionParsing(this);
   }
 
   @Override
@@ -51,87 +41,72 @@ public class PyConsoleParsingContext extends ParsingContext {
   }
 
   private static class ConsoleStatementParsing extends StatementParsing {
-    private final VirtualFile myConsoleFile;
 
-    protected ConsoleStatementParsing(ParsingContext context, @Nullable FUTURE futureFlag, VirtualFile file) {
+    protected ConsoleStatementParsing(ParsingContext context, @Nullable FUTURE futureFlag) {
       super(context, futureFlag);
-      myConsoleFile = file;
     }
 
     protected void checkEndOfStatement(ParsingScope scope) {
-      if (!PyConsoleUtil.isIPythonDetected(myConsoleFile)) {
-        super.checkEndOfStatement(scope);
+      PsiBuilder builder = myContext.getBuilder();
+      if (builder.getTokenType() == PyTokenTypes.STATEMENT_BREAK) {
+        builder.advanceLexer();
+      }
+      else if (builder.getTokenType() == PyTokenTypes.SEMICOLON) {
+        if (!scope.isSuite()) {
+          builder.advanceLexer();
+          if (builder.getTokenType() == PyTokenTypes.STATEMENT_BREAK) {
+            builder.advanceLexer();
+          }
+        }
+      }
+      else if (builder.eof()) {
+        return;
       }
       else {
-        PsiBuilder builder = myContext.getBuilder();
-        if (builder.getTokenType() == PyTokenTypes.STATEMENT_BREAK) {
+        if (builder.getTokenType() == PyConsoleTokenTypes.PLING || builder.getTokenType() == PyConsoleTokenTypes.QUESTION_MARK) {
           builder.advanceLexer();
-        }
-        else if (builder.getTokenType() == PyTokenTypes.SEMICOLON) {
-          if (!scope.isSuite()) {
-            builder.advanceLexer();
-            if (builder.getTokenType() == PyTokenTypes.STATEMENT_BREAK) {
-              builder.advanceLexer();
-            }
-          }
-        }
-        else if (builder.eof()) {
-          return;
-        }
-        else {
           if (builder.getTokenType() == PyConsoleTokenTypes.PLING || builder.getTokenType() == PyConsoleTokenTypes.QUESTION_MARK) {
             builder.advanceLexer();
-            if (builder.getTokenType() == PyConsoleTokenTypes.PLING || builder.getTokenType() == PyConsoleTokenTypes.QUESTION_MARK) {
-              builder.advanceLexer();
-            }
-
-            return;
           }
-          builder.error("end of statement expected");
+
+          return;
         }
+        builder.error("end of statement expected");
       }
     }
   }
 
   private static class ConsoleExpressionParsing extends ExpressionParsing {
-    private final VirtualFile myConsoleFile;
-
-    public ConsoleExpressionParsing(ParsingContext context, VirtualFile file) {
+    public ConsoleExpressionParsing(ParsingContext context) {
       super(context);
-      myConsoleFile = file;
     }
 
     @Override
     public boolean parseExpressionOptional() {
-      if (!PyConsoleUtil.isIPythonDetected(myConsoleFile)) {
-        return super.parseExpressionOptional();
-      }
-      else {
-        if (myBuilder.getTokenType() == PyTokenTypes.PERC || myBuilder.getTokenType() == PyConsoleTokenTypes.PLING) {
-          PsiBuilder.Marker expr = myBuilder.mark();
-          PsiBuilder.Marker command = myBuilder.mark();
+      if (myBuilder.getTokenType() == PyTokenTypes.PERC || myBuilder.getTokenType() == PyConsoleTokenTypes.PLING) {
+        PsiBuilder.Marker expr = myBuilder.mark();
+        PsiBuilder.Marker command = myBuilder.mark();
 
+        myBuilder.advanceLexer();
+
+        if (myBuilder.getTokenType() == PyTokenTypes.IDENTIFIER) {
           myBuilder.advanceLexer();
-
-          if (myBuilder.getTokenType() == PyTokenTypes.IDENTIFIER) {
-            myBuilder.advanceLexer();
-            command.done(PyElementTypes.REFERENCE_EXPRESSION);
-          }
-          else {
-            expr.drop();
-            command.drop();
-            myBuilder.error("Identifier expected.");
-            return false;
-          }
-          while (myBuilder.getTokenType() != null) {
-            myBuilder.advanceLexer();
-          }
-          expr.done(PyElementTypes.EMPTY_EXPRESSION);
-          return true;
+          command.done(PyElementTypes.REFERENCE_EXPRESSION);
         }
         else {
-          return super.parseExpressionOptional();
+          expr.drop();
+          command.drop();
+          myBuilder.error("Identifier expected.");
+          return false;
         }
+        while (myBuilder.getTokenType() != null) {
+          myBuilder.advanceLexer();
+        }
+        expr.done(PyElementTypes.EMPTY_EXPRESSION);
+        return true;
+      }
+      else {
+        return super.parseExpressionOptional();
       }
     }
   }
diff --git a/python/src/com/jetbrains/python/psi/PyFileElementType.java b/python/src/com/jetbrains/python/psi/PyFileElementType.java
index 2a5430ff5611..ba9ebdfb660e 100644
--- a/python/src/com/jetbrains/python/psi/PyFileElementType.java
+++ b/python/src/com/jetbrains/python/psi/PyFileElementType.java
@@ -51,7 +51,7 @@ public class PyFileElementType extends IStubFileElementType<PyFileStub> {
   public ASTNode parseContents(ASTNode chameleon) {
     final FileElement node = (FileElement)chameleon;
     final LanguageLevel languageLevel = getLanguageLevel(node.getPsi());
-    if (PydevConsoleRunner.isInPydevConsole(node)) {
+    if (PydevConsoleRunner.isIPythonConsole(node)) {
       return parseConsoleCode(node, languageLevel);
     }
     final PsiElement psi = node.getPsi();