From 89843685c21eb5e567a4558c5cb7a3ffa91030be Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Wed, 13 Jan 2016 18:46:51 +0300 Subject: [PATCH] Renamed class --- .../resolve/{AllUnderImportsScope.kt => AllUnderImportScope.kt} | 2 +- .../org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename compiler/frontend/src/org/jetbrains/kotlin/resolve/{AllUnderImportsScope.kt => AllUnderImportScope.kt} (96%) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AllUnderImportsScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AllUnderImportScope.kt similarity index 96% rename from compiler/frontend/src/org/jetbrains/kotlin/resolve/AllUnderImportsScope.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/AllUnderImportScope.kt index 6e4c10f789a..29c17d76a57 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AllUnderImportsScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AllUnderImportScope.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.resolve.scopes.ResolutionScope import org.jetbrains.kotlin.utils.Printer -class AllUnderImportsScope(descriptor: DeclarationDescriptor) : BaseImportingScope(null) { +class AllUnderImportScope(descriptor: DeclarationDescriptor) : BaseImportingScope(null) { private val scopes: List = if (descriptor is ClassDescriptor) { listOf(descriptor.staticScope, descriptor.unsubstitutedInnerClassesScope) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt index d3878abf723..2807b24ef1f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt @@ -155,7 +155,7 @@ class QualifiedExpressionResolver(val symbolUsageValidator: SymbolUsageValidator if (packageOrClassDescriptor is ClassDescriptor && packageOrClassDescriptor.kind.isSingleton) { trace.report(Errors.CANNOT_ALL_UNDER_IMPORT_FROM_SINGLETON.on(lastPart.expression, packageOrClassDescriptor)) // todo report on star } - return AllUnderImportsScope(packageOrClassDescriptor) + return AllUnderImportScope(packageOrClassDescriptor) } private fun processSingleImport(