From 665ca5d1fb1d721f0ebc54e86d41c93852cc1228 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 10 May 2016 08:40:55 +0200 Subject: [PATCH] make SameDirectoryWeigher and SameLogicalRootWeigher work with completion file copy --- .../com/intellij/psi/util/proximity/SameDirectoryWeigher.java | 2 +- .../com/intellij/psi/util/proximity/SameLogicalRootWeigher.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/psi/util/proximity/SameDirectoryWeigher.java b/platform/lang-impl/src/com/intellij/psi/util/proximity/SameDirectoryWeigher.java index 7029551548a1..ecc3be1b2fa4 100644 --- a/platform/lang-impl/src/com/intellij/psi/util/proximity/SameDirectoryWeigher.java +++ b/platform/lang-impl/src/com/intellij/psi/util/proximity/SameDirectoryWeigher.java @@ -39,7 +39,7 @@ public class SameDirectoryWeigher extends ProximityWeigher { private static PsiDirectory getParentDirectory(PsiElement element) { PsiFile file = InjectedLanguageUtil.getTopLevelFile(element); if (file != null) { - element = file; + element = file.getOriginalFile(); } while (element != null && !(element instanceof PsiDirectory)) { element = element.getParent(); diff --git a/platform/lang-impl/src/com/intellij/psi/util/proximity/SameLogicalRootWeigher.java b/platform/lang-impl/src/com/intellij/psi/util/proximity/SameLogicalRootWeigher.java index 2e251dbebb16..78d1b26cf5af 100644 --- a/platform/lang-impl/src/com/intellij/psi/util/proximity/SameLogicalRootWeigher.java +++ b/platform/lang-impl/src/com/intellij/psi/util/proximity/SameLogicalRootWeigher.java @@ -57,7 +57,7 @@ public class SameLogicalRootWeigher extends ProximityWeigher { final PsiFile psiFile = element.getContainingFile(); if (psiFile == null) return null; - final VirtualFile file = psiFile.getVirtualFile(); + final VirtualFile file = psiFile.getOriginalFile().getVirtualFile(); if (file == null) return null; return LogicalRootsManager.getLogicalRootsManager(element.getProject()).findLogicalRoot(file);