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

RemoveRedundantQualifierNameInspection: context should evaluated once for KtUserType

Browse Source
This commit is contained in:
Dmitry Gridin
2019-06-20 16:22:59 +07:00
parent ac730a693a
commit b930c061a8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/RemoveRedundantQualifierNameInspection.kt
+5 -5
View File
@@ -14,7 +14,6 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.core.ShortenReferences import org.jetbrains.kotlin.idea.core.ShortenReferences
import org.jetbrains.kotlin.idea.imports.importableFqName import org.jetbrains.kotlin.idea.imports.importableFqName
import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.idea.references.mainReference
import org.jetbrains.kotlin.idea.references.resolveMainReferenceToDescriptors
import org.jetbrains.kotlin.idea.util.getResolutionScope import org.jetbrains.kotlin.idea.util.getResolutionScope
import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
@@ -49,7 +48,8 @@ class RemoveRedundantQualifierNameInspection : AbstractKotlinInspection(), Clean
override fun visitUserType(type: KtUserType) { override fun visitUserType(type: KtUserType) {
if (type.parent is KtUserType) return if (type.parent is KtUserType) return
val applicableExpression = type.firstApplicableExpression(KtUserType::applicableExpression) { val context = type.analyze()
val applicableExpression = type.firstApplicableExpression(validator = { applicableExpression(context) }) {
firstChild as? KtUserType firstChild as? KtUserType
} ?: return } ?: return
@@ -95,13 +95,13 @@ private fun KtExpression.isApplicableReceiver(context: BindingContext): Boolean
else descriptor.name.asString() != reference.text else descriptor.name.asString() != reference.text
} }
private fun KtUserType.applicableExpression(): KtUserType? { private fun KtUserType.applicableExpression(context: BindingContext): KtUserType? {
if (firstChild !is KtUserType) return null if (firstChild !is KtUserType) return null
val referenceExpression = referenceExpression as? KtNameReferenceExpression ?: return null val referenceExpression = referenceExpression as? KtNameReferenceExpression ?: return null
val originalDescriptor = referenceExpression.resolveMainReferenceToDescriptors().firstOrNull() ?: return null val originalDescriptor = referenceExpression.mainReference.resolveToDescriptors(context).firstOrNull() ?: return null
val shortName = originalDescriptor.importableFqName?.shortName() ?: return null val shortName = originalDescriptor.importableFqName?.shortName() ?: return null
val scope = referenceExpression.getResolutionScope() val scope = referenceExpression.getResolutionScope(context) ?: return null
val descriptor = scope.findFirstClassifierWithDeprecationStatus(shortName, NoLookupLocation.FROM_IDE)?.descriptor ?: return null val descriptor = scope.findFirstClassifierWithDeprecationStatus(shortName, NoLookupLocation.FROM_IDE)?.descriptor ?: return null
return if (descriptor == originalDescriptor) this else null return if (descriptor == originalDescriptor) this else null
} }