Revert "Support decapitilized obsolete annotations in resolve"

This reverts commit 4159c83282.
This commit is contained in:
Denis Zharkov
2015-09-15 17:11:29 +03:00
parent 53bccec50d
commit f518348565
6 changed files with 9 additions and 90 deletions
@@ -20,8 +20,6 @@ import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.scopes.DecapitalizedAnnotationScope
import org.jetbrains.kotlin.resolve.scopes.JetScope
import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.kotlin.serialization.SerializedResourcePaths
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope
@@ -58,17 +56,10 @@ public abstract class DeserializedPackageFragment(
DeserializedPackageMemberScope(this, packageProto, nameResolver, components, classNames = { loadClassNames(packageProto) })
}
// Just a temporary hack to inject deprecated decapitalized annotation
internal val deserializedMemberScopeWrapped by storageManager.createLazyValue {
DecapitalizedAnnotationScope.wrapIfNeeded(deserializedMemberScope, fqName)
}
override fun getMemberScope(): JetScope {
return deserializedMemberScopeWrapped
}
override fun getMemberScope() = deserializedMemberScope
internal fun hasTopLevelClass(name: Name): Boolean {
return name in deserializedMemberScope.classNames
return name in getMemberScope().classNames
}
protected abstract fun loadClassNames(packageProto: ProtoBuf.Package): Collection<Name>