IDEA-120209 Resolve in jsp links to web resources from external .war file: tag dir support

This commit is contained in:
Dmitry Avdeev
2014-02-12 16:04:18 +04:00
parent c042f8eacd
commit f9a88288e2
2 changed files with 5 additions and 3 deletions
@@ -141,9 +141,7 @@ public class FileReference implements PsiFileReference, FileReferenceOwner, PsiP
final Collection<PsiFileSystemItem> contexts = getContexts();
final Collection<ResolveResult> result = new THashSet<ResolveResult>();
for (final PsiFileSystemItem context : contexts) {
if (context != null) {
innerResolveInContext(referenceText, context, result, caseSensitive);
}
innerResolveInContext(referenceText, context, result, caseSensitive);
}
if (contexts.isEmpty() && isAllowedEmptyPath(referenceText)) {
result.add(new PsiElementResolveResult(getElement().getContainingFile()));
@@ -123,6 +123,10 @@ public class FileReferenceSet {
return "/";
}
/**
* This should be removed. Please use {@link FileReference#getContexts()} instead.
*/
@Deprecated
protected Collection<PsiFileSystemItem> getExtraContexts() {
return Collections.emptyList();
}