From edffc8f3c24a17648020b169d9447b8df92f49d0 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Mon, 11 Oct 2010 13:21:36 +0400 Subject: [PATCH] javadoc roots: fix for library located under module dir --- .../com/intellij/lang/java/JavaDocumentationProvider.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java b/java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java index 69a814963da7..e96955333002 100644 --- a/java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java +++ b/java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java @@ -701,7 +701,11 @@ public class JavaDocumentationProvider implements CodeDocumentationProvider, Ext } if (module != null) { String[] javadocPaths = ModuleRootManager.getInstance(module).getRootUrls(JavadocOrderRootType.getInstance()); - return getHttpRoots(javadocPaths, relPath); + final List httpRoots = getHttpRoots(javadocPaths, relPath); + // if found nothing and the file is from library classes, fall back to order entries + if (httpRoots != null || !fileIndex.isInLibraryClasses(virtualFile)) { + return httpRoots; + } } final List orderEntries = fileIndex.getOrderEntriesForFile(virtualFile);