From adb43ca4e7831dc685fc369f130840601d0989d8 Mon Sep 17 00:00:00 2001 From: "peter.gromov" Date: Fri, 26 Nov 2010 14:12:52 +0300 Subject: [PATCH] openedInEditor should check the original file --- .../intellij/psi/util/proximity/OpenedInEditorWeigher.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/psi/util/proximity/OpenedInEditorWeigher.java b/platform/lang-impl/src/com/intellij/psi/util/proximity/OpenedInEditorWeigher.java index feea3e66329b..9e665dd37e5c 100644 --- a/platform/lang-impl/src/com/intellij/psi/util/proximity/OpenedInEditorWeigher.java +++ b/platform/lang-impl/src/com/intellij/psi/util/proximity/OpenedInEditorWeigher.java @@ -19,8 +19,8 @@ import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.util.NotNullLazyKey; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiFile; import com.intellij.psi.util.ProximityLocation; -import com.intellij.psi.util.PsiUtilBase; import com.intellij.util.ArrayUtil; import com.intellij.util.NotNullFunction; import org.jetbrains.annotations.NotNull; @@ -41,7 +41,10 @@ public class OpenedInEditorWeigher extends ProximityWeigher { if (location.getProject() == null){ return null; } - final VirtualFile virtualFile = PsiUtilBase.getVirtualFile(element); + final PsiFile psiFile = element.getContainingFile(); + if (psiFile == null) return false; + + final VirtualFile virtualFile = psiFile.getOriginalFile().getVirtualFile(); return virtualFile != null && ArrayUtil.find(OPENED_EDITORS.getValue(location), virtualFile) != -1; } }