From 123b6ed529a3db540c6c7d9c2a63e006833b4970 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 9 Sep 2014 19:04:34 +0400 Subject: [PATCH] Do not skip top level members from sources under library classes root Fix problems with JavaScript libraries --- .../jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt index f4deee773e1..8a08b0b0e7f 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt @@ -231,9 +231,7 @@ private object KotlinResolveDataProvider { } val file = analyzableElement.getContainingJetFile() - val virtualFile = file.getVirtualFile() - if (LightClassUtil.belongsToKotlinBuiltIns(file) - || virtualFile != null && LibraryUtil.findLibraryEntry(virtualFile, file.getProject()) != null) { + if (LightClassUtil.belongsToKotlinBuiltIns(file) || file.getModuleInfo() is LibrarySourceInfo) { // Library sources: mark file to skip file.putUserData(LibrarySourceHacks.SKIP_TOP_LEVEL_MEMBERS, true) }