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

open file using FileManager instead of navigate (IDEA-65392 NPE)

Browse Source
This commit is contained in:
Konstantin Bulenkov
2011-02-15 17:16:36 +03:00
parent 9d6ce50537
commit 5b0765bb14
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/IconLineMarkerProvider.java
+6 -2
View File
@@ -21,7 +21,10 @@ import com.intellij.codeInsight.daemon.GutterIconNavigationHandler;
import com.intellij.codeInsight.daemon.LineMarkerInfo;
import com.intellij.codeInsight.daemon.LineMarkerProvider;
import com.intellij.openapi.editor.markup.GutterIconRenderer;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReference;
@@ -107,7 +110,7 @@ public class IconLineMarkerProvider implements LineMarkerProvider {
@Nullable
private LineMarkerInfo<PsiElement> resolveIconInfo(PsiType type, PsiExpression initializer, PsiElement bindingElement) {
if (initializer != null && initializer.isValid() && isIconClassType(type)) {
final Project project = initializer.getProject();
final List<FileReference> refs = new ArrayList<FileReference>();
initializer.accept(new JavaRecursiveElementWalkingVisitor() {
@Override
@@ -146,9 +149,10 @@ public class IconLineMarkerProvider implements LineMarkerProvider {
final Icon icon = getIcon(file);
if (icon != null) {
final Ref<VirtualFile> f = Ref.create(file);
final GutterIconNavigationHandler<PsiElement> navHandler = new GutterIconNavigationHandler<PsiElement>() {
public void navigate(MouseEvent e, PsiElement elt) {
psiFileSystemItem.navigate(true);
FileEditorManager.getInstance(project).openFile(f.get(), true);
}
};
return new LineMarkerInfo<PsiElement>(bindingElement, bindingElement.getTextRange(), icon,