MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix NPE via GotoDeclarationAction.update

Browse Source
This commit is contained in:
peter
2015-07-20 11:09:28 +02:00
parent 264c3b103f
commit 437cdd7c4e
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/actions/BaseCodeInsightAction.java
+1 -2
View File
@@ -21,7 +21,6 @@ import com.intellij.codeInsight.lookup.LookupManager;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.actionSystem.Presentation;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
@@ -68,7 +67,7 @@ public abstract class BaseCodeInsightAction extends CodeInsightAction {
}
@Nullable
protected Editor getBaseEditor(final DataContext dataContext, final Project project) {
protected Editor getBaseEditor(@NotNull final DataContext dataContext, @NotNull final Project project) {
return super.getEditor(dataContext, project);
}
platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowContainerInfoAction.java
+1 -1
View File
@@ -37,7 +37,7 @@ public class ShowContainerInfoAction extends BaseCodeInsightAction{
@Override
@Nullable
protected Editor getBaseEditor(final DataContext dataContext, final Project project) {
protected Editor getBaseEditor(@NotNull final DataContext dataContext, @NotNull final Project project) {
return CommonDataKeys.EDITOR_EVEN_IF_INACTIVE.getData(dataContext);
}
platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java
+7 -1
View File
@@ -271,7 +271,13 @@ public class GotoDeclarationAction extends BaseCodeInsightAction implements Code
if (component != null) {
Point point = ((MouseEvent)inputEvent).getPoint();
Component componentAt = SwingUtilities.getDeepestComponentAt(component, point.x, point.y);
Editor editor = getBaseEditor(event.getDataContext(), event.getProject());
Project project = event.getProject();
if (project == null) {
event.getPresentation().setEnabled(false);
return;
}
Editor editor = getBaseEditor(event.getDataContext(), project);
if (componentAt instanceof EditorGutterComponentEx) {
event.getPresentation().setEnabled(false);
return;