azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed class

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-01-13 18:46:51 +03:00
parent af66af07a0
commit 89843685c2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/AllUnderImportsScope.kt → compiler/frontend/src/org/jetbrains/kotlin/resolve/AllUnderImportScope.kt
+1 -1
View File
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.resolve.scopes.ResolutionScope import org.jetbrains.kotlin.resolve.scopes.ResolutionScope
import org.jetbrains.kotlin.utils.Printer import org.jetbrains.kotlin.utils.Printer
class AllUnderImportsScope(descriptor: DeclarationDescriptor) : BaseImportingScope(null) { class AllUnderImportScope(descriptor: DeclarationDescriptor) : BaseImportingScope(null) {
private val scopes: List<ResolutionScope> = if (descriptor is ClassDescriptor) { private val scopes: List<ResolutionScope> = if (descriptor is ClassDescriptor) {
listOf(descriptor.staticScope, descriptor.unsubstitutedInnerClassesScope) listOf(descriptor.staticScope, descriptor.unsubstitutedInnerClassesScope)
} }
compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt
+1 -1
View File
@@ -155,7 +155,7 @@ class QualifiedExpressionResolver(val symbolUsageValidator: SymbolUsageValidator
if (packageOrClassDescriptor is ClassDescriptor && packageOrClassDescriptor.kind.isSingleton) { if (packageOrClassDescriptor is ClassDescriptor && packageOrClassDescriptor.kind.isSingleton) {
trace.report(Errors.CANNOT_ALL_UNDER_IMPORT_FROM_SINGLETON.on(lastPart.expression, packageOrClassDescriptor)) // todo report on star 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( private fun processSingleImport(