diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/LibrarySourceHacks.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/LibrarySourceHacks.kt deleted file mode 100644 index ef7642ffc97..00000000000 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/LibrarySourceHacks.kt +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.resolve - -import com.intellij.openapi.util.Key -import org.jetbrains.kotlin.descriptors.CallableDescriptor -import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor -import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor - -object LibrarySourceHacks { - val SKIP_TOP_LEVEL_MEMBERS: Key = Key.create("SKIP_TOP_LEVEL_MEMBERS") // used when analyzing library source - - fun shouldSkip(member: CallableDescriptor): Boolean { - val original = member.original as? CallableMemberDescriptor ?: return false - - if (original.containingDeclaration !is PackageFragmentDescriptor) return false - - val declaration = DescriptorToSourceUtils.getSourceFromDescriptor(original) ?: return false - - val file = declaration.containingFile - return file != null && (file.getUserData(SKIP_TOP_LEVEL_MEMBERS) ?: false) - } -} diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt index 4a8fd289058..7d3cd231772 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt @@ -156,12 +156,6 @@ private object KotlinResolveDataProvider { return AnalysisResult.success(analyzeExpressionCodeFragment(componentProvider, analyzableElement), module) } - val file = analyzableElement.containingKtFile - if (file.getModuleInfo() is LibrarySourceInfo) { - // Library sources: mark file to skip - file.putUserData(LibrarySourceHacks.SKIP_TOP_LEVEL_MEMBERS, true) - } - val resolveSession = componentProvider.get() val trace = DelegatingBindingTrace(resolveSession.bindingContext, "Trace for resolution of " + analyzableElement)