From 5a9943dfc8ff13a73b29bd4222e46855c8706820 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 18 Jul 2013 14:47:03 +0200 Subject: [PATCH] another place where fallback helpers need to be skipped (fix JspResolveInContextTest.testIncludeFileRefInIncluded) --- .../resolve/reference/impl/providers/FileReferenceSet.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java b/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java index 60f80782a990..de579d3714c2 100644 --- a/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java +++ b/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java @@ -350,6 +350,9 @@ public class FileReferenceSet { final Project project = file.getProject(); for (FileReferenceHelper helper : helpers) { if (helper.isMine(project, virtualFile)) { + if (list.size() > 0 && helper.isFallback()) { + continue; + } list.addAll(helper.getContexts(project, virtualFile)); } }