fix yellow code producing by CommonDataKeys

This commit is contained in:
Konstantin Bulenkov
2013-10-01 22:28:20 +02:00
parent 344bb2d4a4
commit 599f12193c
3 changed files with 4 additions and 3 deletions
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable;
public class PyTypeHierachyProvider implements HierarchyProvider {
@Nullable
public PsiElement getTarget(@NotNull DataContext dataContext) {
PsiElement element = LangDataKeys.PSI_ELEMENT.getData(dataContext);
PsiElement element = CommonDataKeys.PSI_ELEMENT.getData(dataContext);
if (element == null) {
final Editor editor = CommonDataKeys.EDITOR.getData(dataContext);
final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext);
@@ -50,7 +50,7 @@ public class PyChangeSignatureHandler implements ChangeSignatureHandler {
public void invoke(@NotNull Project project, Editor editor, PsiFile file, DataContext dataContext) {
PsiElement element = findTargetMember(file, editor);
if (element == null) {
element = LangDataKeys.PSI_ELEMENT.getData(dataContext);
element = CommonDataKeys.PSI_ELEMENT.getData(dataContext);
}
invokeOnElement(project, element, editor);
}
@@ -1,5 +1,6 @@
package com.jetbrains.python.refactoring.invertBoolean;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.actionSystem.LangDataKeys;
import com.intellij.openapi.editor.Editor;
@@ -22,7 +23,7 @@ public class PyInvertBooleanHandler implements RefactoringActionHandler {
@Override
public void invoke(@NotNull Project project, Editor editor, PsiFile file, DataContext dataContext) {
PsiElement element = LangDataKeys.PSI_ELEMENT.getData(dataContext);
PsiElement element = CommonDataKeys.PSI_ELEMENT.getData(dataContext);
if (element == null && editor != null && file != null) {
element = file.findElementAt(editor.getCaretModel().getOffset());
}