From b3036d37c299f7e85d9980b46e679664d718f093 Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Mon, 24 Aug 2015 11:59:08 +0300
Subject: [PATCH] merge simplified_debugger branch

---
 python/edu/src/META-INF/PyCharmEduPlugin.xml                  | 4 +++-
 .../com/jetbrains/edu/learning/actions/StudyCheckAction.java  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/python/edu/src/META-INF/PyCharmEduPlugin.xml b/python/edu/src/META-INF/PyCharmEduPlugin.xml
index 65eb9ca1bed0..2d553892cba1 100644
--- a/python/edu/src/META-INF/PyCharmEduPlugin.xml
+++ b/python/edu/src/META-INF/PyCharmEduPlugin.xml
@@ -34,7 +34,9 @@
       <consoleInputFilterProvider implementation="com.jetbrains.python.edu.debugger.PyEduConsoleInputFilterProvider"/>
   </extensions>
   <extensions defaultExtensionNs="Edu">
-    <executeFile implementation="com.jetbrains.python.edu.PyEduAddParametersAction"/>
+    <executeFile implementation="com.jetbrains.python.edu.PyEduAddParametersAction" order="last"/>
+    <executeFile implementation="com.jetbrains.python.edu.PyDebugCurrentFile"/>
+
   </extensions>
 
 </idea-plugin>
diff --git a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java
index 596446f3daaa..32cb5fa41be3 100644
--- a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java
+++ b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java
@@ -104,7 +104,7 @@ public class StudyCheckAction extends DumbAwareAction {
 
   public void check(@NotNull final Project project) {
     if (DumbService.isDumb(project)) {
-      DumbService.getInstance(project).showDumbModeNotification("Check Action is not available while indexing in in progress");
+      DumbService.getInstance(project).showDumbModeNotification("Check Action is not available while indexing is in progress");
       return;
     }
     ApplicationManager.getApplication().runWriteAction(new Runnable() {