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

Report deprecation on typealias companion object for deprecated alias

Browse Source
This commit is contained in:
Dmitry Petrov
2017-08-09 17:31:39 +03:00
parent c180de563f
commit 674d30cd76
8 changed files with 79 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ClassifierUsageChecker.kt
+9 -7
View File
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.config.LanguageVersionSettings
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.ClassifierDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithSource
import org.jetbrains.kotlin.descriptors.TypeAliasDescriptor
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.KtNameReferenceExpression
import org.jetbrains.kotlin.psi.KtReferenceExpression
@@ -28,6 +29,7 @@ import org.jetbrains.kotlin.psi.KtTreeVisitorVoid
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.BindingTrace
import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.utils.addToStdlib.safeAs
interface ClassifierUsageChecker {
fun check(
@@ -58,9 +60,12 @@ interface ClassifierUsageChecker {
runCheckersWithTarget(target, expression)
if (isReferenceToCompanionViaOuterClass(expression, target)) {
getReferenceToCompanionViaClassifier(expression, target)?.let { referenceClassifier ->
val outerClass = target.containingDeclaration as ClassDescriptor
runCheckersWithTarget(outerClass, expression)
if (referenceClassifier is TypeAliasDescriptor) {
runCheckersWithTarget(referenceClassifier, expression)
}
}
}
@@ -84,12 +89,9 @@ interface ClassifierUsageChecker {
return targets.filterIsInstance<ClassifierDescriptor>().singleOrNull()
}
/**
* @return true iff [expression] references the companion of a class Foo via the name Foo, e.g. in `Foo.bar()`
*/
private fun isReferenceToCompanionViaOuterClass(expression: KtReferenceExpression, target: ClassifierDescriptor?): Boolean {
return DescriptorUtils.isCompanionObject(target) &&
trace.get(BindingContext.SHORT_REFERENCE_TO_COMPANION_OBJECT, expression) != null
private fun getReferenceToCompanionViaClassifier(expression: KtReferenceExpression, target: ClassifierDescriptor): ClassifierDescriptor? {
if (!DescriptorUtils.isCompanionObject(target)) return null
return trace.get(BindingContext.SHORT_REFERENCE_TO_COMPANION_OBJECT, expression)
}
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecationUtil.kt
+2 -1
View File
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
import org.jetbrains.kotlin.descriptors.annotations.Annotations
import org.jetbrains.kotlin.descriptors.impl.DescriptorDerivedFromTypeAlias
import org.jetbrains.kotlin.descriptors.impl.TypeAliasConstructorDescriptor
import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.diagnostics.Errors
@@ -253,7 +254,7 @@ private fun DeclarationDescriptor.getOwnDeprecations(languageVersionSettings: La
is TypeAliasDescriptor -> {
expandedType.deprecationsByConstituentTypes(languageVersionSettings).mapTo(result) { it.wrapInTypeAliasExpansion(this) }
}
is TypeAliasConstructorDescriptor -> {
is DescriptorDerivedFromTypeAlias -> {
result.addAll(typeAliasDescriptor.getOwnDeprecations(languageVersionSettings))
}
is ConstructorDescriptor -> {