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

Remove scope from Qualifier

Browse Source
This commit is contained in:
Stanislav Erokhin
2016-02-22 20:53:06 +03:00
parent 4b3c6d52ef
commit f130de2468
7 changed files with 70 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt
+5 -4
View File
@@ -407,16 +407,17 @@ class QualifiedExpressionResolver(val symbolUsageValidator: SymbolUsageValidator
): Qualifier? {
val name = expression.getReferencedNameAsName()
val location = KotlinLookupLocation(expression)
val qualifierDescriptor = when (receiver) {
is PackageQualifier -> {
val childPackageFQN = receiver.descriptor.fqName.child(name)
receiver.descriptor.module.getPackage(childPackageFQN).check { !it.isEmpty() } ?:
receiver.descriptor.memberScope.getContributedClassifier(name, KotlinLookupLocation(expression))
receiver.descriptor.memberScope.getContributedClassifier(name, location)
}
is ClassQualifier -> receiver.scope.getContributedClassifier(name, KotlinLookupLocation(expression))
null -> context.scope.findClassifier(name, KotlinLookupLocation(expression)) ?:
is ClassQualifier -> receiver.staticScope.getContributedClassifier(name, location)
null -> context.scope.findClassifier(name, location) ?:
context.scope.ownerDescriptor.module.getPackage(FqName.ROOT.child(name)).check { !it.isEmpty() }
is ReceiverValue -> receiver.type.memberScope.memberScopeAsImportingScope().findClassifier(name, KotlinLookupLocation(expression))
is ReceiverValue -> receiver.type.memberScope.memberScopeAsImportingScope().findClassifier(name, location)
else -> null
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt
+1 -26
View File
@@ -22,11 +22,8 @@ import org.jetbrains.kotlin.psi.KtSimpleNameExpression
import org.jetbrains.kotlin.psi.psiUtil.getTopmostParentQualifiedExpressionForSelector
import org.jetbrains.kotlin.resolve.descriptorUtil.classValueType
import org.jetbrains.kotlin.resolve.scopes.ChainedMemberScope
import org.jetbrains.kotlin.resolve.scopes.FilteringScope
import org.jetbrains.kotlin.resolve.scopes.MemberScope
import org.jetbrains.kotlin.resolve.scopes.ScopeUtils
import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.utils.addIfNotNull
import java.util.*
interface QualifierReceiver : Receiver {
@@ -40,8 +37,6 @@ abstract class Qualifier(val referenceExpression: KtSimpleNameExpression) : Qual
get() = referenceExpression.getTopmostParentQualifiedExpressionForSelector() ?: referenceExpression
abstract val descriptor: DeclarationDescriptor
abstract val scope: MemberScope
}
class PackageQualifier(
@@ -49,8 +44,6 @@ class PackageQualifier(
override val descriptor: PackageViewDescriptor
) : Qualifier(referenceExpression) {
override val scope: MemberScope get() = descriptor.memberScope
override val staticScope: MemberScope get() = descriptor.memberScope
override val classValueReceiver: ReceiverValue? get() = null
@@ -62,7 +55,6 @@ class TypeParameterQualifier(
referenceExpression: KtSimpleNameExpression,
override val descriptor: TypeParameterDescriptor
) : Qualifier(referenceExpression) {
override val scope: MemberScope get() = MemberScope.Empty
override val staticScope: MemberScope get() = MemberScope.Empty
override val classValueReceiver: ReceiverValue? get() = null
}
@@ -75,30 +67,13 @@ class ClassQualifier(
ClassValueReceiver(this, it)
}
override val scope: MemberScope get() {
val scopes = ArrayList<MemberScope>(3)
val classObjectTypeScope = descriptor.classValueType?.memberScope?.let {
FilteringScope(it) { it !is ClassDescriptor }
}
scopes.addIfNotNull(classObjectTypeScope)
scopes.add(descriptor.staticScope)
if (descriptor.kind != ClassKind.ENUM_ENTRY) {
scopes.add(descriptor.unsubstitutedInnerClassesScope)
}
return ChainedMemberScope("Member scope for ${descriptor.name} as class or object", scopes)
}
override val staticScope: MemberScope get() {
val scopes = ArrayList<MemberScope>(2)
scopes.add(descriptor.staticScope)
if (descriptor.kind != ClassKind.ENUM_ENTRY) {
scopes.add(ScopeUtils.getStaticNestedClassesScope(descriptor))
scopes.add(descriptor.unsubstitutedInnerClassesScope)
}
return ChainedMemberScope("Static scope for ${descriptor.name} as class or object", scopes)
idea/ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt
+10 -5
View File
@@ -1,6 +1,5 @@
/*
* Copyright 2010-2015 JetBrains s.r.o.
* Copyright 2010-2016 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.
@@ -31,11 +30,13 @@ import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo
import org.jetbrains.kotlin.resolve.calls.smartcasts.SmartCastManager
import org.jetbrains.kotlin.resolve.isHiddenInResolution
import org.jetbrains.kotlin.resolve.scopes.*
import org.jetbrains.kotlin.resolve.scopes.receivers.ClassQualifier
import org.jetbrains.kotlin.resolve.scopes.utils.collectDescriptorsFiltered
import org.jetbrains.kotlin.resolve.scopes.utils.memberScopeAsImportingScope
import org.jetbrains.kotlin.synthetic.SyntheticJavaPropertyDescriptor
import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.types.typeUtil.isUnit
import org.jetbrains.kotlin.utils.addToStdlib.check
import java.util.*
class ReferenceVariantsHelper(
@@ -175,7 +176,7 @@ class ReferenceVariantsHelper(
if (receiverExpression != null) {
val qualifier = bindingContext[BindingContext.QUALIFIER, receiverExpression]
if (qualifier != null) {
descriptors.addAll(qualifier.scope.getDescriptorsFiltered(kindFilter exclude DescriptorKindExclude.Extensions, nameFilter))
descriptors.addAll(qualifier.staticScope.getDescriptorsFiltered(kindFilter exclude DescriptorKindExclude.Extensions, nameFilter))
}
val explicitReceiverTypes = if (useReceiverType != null) {
@@ -213,7 +214,7 @@ class ReferenceVariantsHelper(
): Collection<DeclarationDescriptor> {
if (receiverExpression != null) {
val qualifier = bindingContext[BindingContext.QUALIFIER, receiverExpression] ?: return emptyList()
return qualifier.scope.getDescriptorsFiltered(kindFilter, nameFilter)
return qualifier.staticScope.getDescriptorsFiltered(kindFilter, nameFilter)
}
else {
val scope = contextElement.getResolutionScope(bindingContext, resolutionFacade)
@@ -249,7 +250,11 @@ class ReferenceVariantsHelper(
): Collection<DeclarationDescriptor> {
if (receiverExpression != null) {
val qualifier = bindingContext[BindingContext.QUALIFIER, receiverExpression] ?: return emptyList()
return qualifier.scope.getDescriptorsFiltered(kindFilter, nameFilter)
val staticDescriptors = qualifier.staticScope.getDescriptorsFiltered(kindFilter, nameFilter)
val objectDescriptor = (qualifier as? ClassQualifier)?.descriptor?.check { it.kind == ClassKind.OBJECT } ?: return staticDescriptors
return staticDescriptors + objectDescriptor.defaultType.memberScope.getDescriptorsFiltered(kindFilter, nameFilter)
}
else {
val rootPackage = resolutionFacade.moduleDescriptor.getPackage(FqName.ROOT)
idea/idea-completion/testData/basic/common/staticMembers/ImportsFromEnumEntry.kt
Vendored
+13
View File
@@ -0,0 +1,13 @@
package b
import b.Bar.A.<caret>
enum class Bar {
A;
fun foo() {}
}
// INVOCATION_COUNT: 2
// ABSENT: foo
idea/idea-completion/testData/basic/common/staticMembers/ImportsFromNonObject.kt
Vendored
+17
View File
@@ -0,0 +1,17 @@
package b
import b.A.<caret>
class A {
fun bar() {}
companion object {
fun foo() {}
}
}
// INVOCATION_COUNT: 2
// EXIST: Companion
// ABSENT: bar
// ABSENT: foo
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java
+12
View File
@@ -2250,6 +2250,18 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/staticMembers"), Pattern.compile("^(.+)\\.kt$"), true);
}
@TestMetadata("ImportsFromEnumEntry.kt")
public void testImportsFromEnumEntry() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/ImportsFromEnumEntry.kt");
doTest(fileName);
}
@TestMetadata("ImportsFromNonObject.kt")
public void testImportsFromNonObject() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/ImportsFromNonObject.kt");
doTest(fileName);
}
@TestMetadata("ImportsFromObjectNoDuplicates.kt")
public void testImportsFromObjectNoDuplicates() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/ImportsFromObjectNoDuplicates.kt");
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java
+12
View File
@@ -2250,6 +2250,18 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/staticMembers"), Pattern.compile("^(.+)\\.kt$"), true);
}
@TestMetadata("ImportsFromEnumEntry.kt")
public void testImportsFromEnumEntry() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/ImportsFromEnumEntry.kt");
doTest(fileName);
}
@TestMetadata("ImportsFromNonObject.kt")
public void testImportsFromNonObject() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/ImportsFromNonObject.kt");
doTest(fileName);
}
@TestMetadata("ImportsFromObjectNoDuplicates.kt")
public void testImportsFromObjectNoDuplicates() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/ImportsFromObjectNoDuplicates.kt");