From 276bdcce065d74308e6f02a477fbf463a53f23ce Mon Sep 17 00:00:00 2001 From: "Liana.Bakradze" Date: Wed, 29 Mar 2017 18:04:31 +0300 Subject: [PATCH] EDU-901 "Check" doesn't work if focus is not on the editor --- .../jetbrains/edu/learning/actions/StudyCheckAction.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java index f41fc30a1b50..984d1a5dd699 100644 --- a/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java +++ b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java @@ -1,11 +1,12 @@ package com.jetbrains.edu.learning.actions; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.KeyboardShortcut; import com.intellij.openapi.actionSystem.Presentation; +import com.intellij.openapi.editor.Editor; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.fileEditor.FileDocumentManager; +import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.keymap.KeymapUtil; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; @@ -53,7 +54,11 @@ public abstract class StudyCheckAction extends StudyActionWithShortcut { return; } FileDocumentManager.getInstance().saveAllDocuments(); - VirtualFile virtualFile = CommonDataKeys.VIRTUAL_FILE.getData(e.getDataContext()); + Editor editor = FileEditorManager.getInstance(project).getSelectedTextEditor(); + if (editor == null) { + return; + } + VirtualFile virtualFile = FileDocumentManager.getInstance().getFile(editor.getDocument()); if (virtualFile == null) { return; }