merge simplified_debugger branch

This commit is contained in:
Ekaterina Tuzova
2015-08-24 11:59:08 +03:00
parent 9585af4919
commit b3036d37c2
2 changed files with 4 additions and 2 deletions
+3 -1
View File
@@ -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>
@@ -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() {