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

KT-14352 Record short reference to companion object via type alias,

Browse Source 
so that it would be checked properly.
This commit is contained in:
Dmitry Petrov
2016-10-14 11:55:42 +03:00
parent ac675784c1
commit 753a558bcb
8 changed files with 88 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java
+2 -2
View File
@@ -117,8 +117,8 @@ public interface BindingContext {
WritableSlice<KtReferenceExpression, DeclarationDescriptor> REFERENCE_TARGET =
new BasicWritableSlice<KtReferenceExpression, DeclarationDescriptor>(DO_NOTHING);
// if 'A' really means 'A.Companion' then this slice stores class descriptor for A, REFERENCE_TARGET stores descriptor Companion in this case
WritableSlice<KtReferenceExpression, ClassDescriptor> SHORT_REFERENCE_TO_COMPANION_OBJECT =
new BasicWritableSlice<KtReferenceExpression, ClassDescriptor>(DO_NOTHING);
WritableSlice<KtReferenceExpression, ClassifierDescriptorWithTypeParameters> SHORT_REFERENCE_TO_COMPANION_OBJECT =
new BasicWritableSlice<KtReferenceExpression, ClassifierDescriptorWithTypeParameters>(DO_NOTHING);
WritableSlice<Call, ResolvedCall<?>> RESOLVED_CALL = new BasicWritableSlice<Call, ResolvedCall<?>>(DO_NOTHING);
WritableSlice<Call, TailRecursionKind> TAIL_RECURSION_CALL = Slices.createSimpleSlice();
compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolveUtil.kt
+1 -1
View File
@@ -89,7 +89,7 @@ private fun resolveQualifierReferenceTarget(
}
// TODO make decisions about short reference to companion object somewhere else
if (qualifier is ClassQualifier) {
if (qualifier is ClassifierQualifier) {
val classifier = qualifier.descriptor
val selectorIsCallable = selector is CallableDescriptor &&
(selector.dispatchReceiverParameter != null || selector.extensionReceiverParameter != null)
compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ClassifierUsageChecker.kt
+8 -6
View File
@@ -56,15 +56,17 @@ interface ClassifierUsageChecker {
val target = getReferencedClassifier(expression) ?: return
for (checker in checkers) {
checker.check(target, trace, expression, languageVersionSettings)
}
runCheckersWithTarget(target, expression)
if (isReferenceToCompanionViaOuterClass(expression, target)) {
val outerClass = target.containingDeclaration as ClassDescriptor
for (checker in checkers) {
checker.check(outerClass, trace, expression, languageVersionSettings)
}
runCheckersWithTarget(outerClass, expression)
}
}
private fun runCheckersWithTarget(target: ClassifierDescriptor, expression: KtReferenceExpression) {
for (checker in checkers) {
checker.check(target, trace, expression, languageVersionSettings)
}
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt
+3 -1
View File
@@ -53,7 +53,9 @@ class TypeParameterQualifier(
override fun toString() = "TypeParameter{$descriptor}"
}
interface ClassifierQualifier : Qualifier
interface ClassifierQualifier : Qualifier {
override val descriptor: ClassifierDescriptorWithTypeParameters
}
class ClassQualifier(
override val referenceExpression: KtSimpleNameExpression,