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

Property accessor isn't recursive when called on another object

Browse Source 
So #KT-18120 Fixed
This commit is contained in:
Dmitry Neverov
2017-06-04 12:25:34 +03:00
committed by Mikhail Glukhikh
parent ecfc2236a6
commit e2aa3518df
3 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/RecursivePropertyAccessorInspection.kt
+10
View File
@@ -20,6 +20,8 @@ import com.intellij.codeInspection.*
import com.intellij.openapi.project.Project
import com.intellij.psi.PsiElementVisitor
import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.*
@@ -96,6 +98,9 @@ class RecursivePropertyAccessorInspection : AbstractKotlinInspection() {
val bindingContext = element.analyze()
val target = bindingContext[REFERENCE_TARGET, element]
if (target != bindingContext[BindingContext.DECLARATION_TO_DESCRIPTOR, propertyAccessor.property]) return false
(element.parent as? KtQualifiedExpression)?.let {
if (it.receiverExpression.text != KtTokens.THIS_KEYWORD.value && !it.hasObjectReceiver(bindingContext)) return false
}
return isSameAccessor(element, propertyAccessor.isGetter)
}
@@ -114,5 +119,10 @@ class RecursivePropertyAccessorInspection : AbstractKotlinInspection() {
namedFunctionDescriptor != syntheticDescriptor.setMethod) return false
return isSameAccessor(element, isGetter)
}
private fun KtQualifiedExpression.hasObjectReceiver(context: BindingContext) : Boolean {
val receiver = receiverExpression as? KtReferenceExpression ?: return false
return (context[REFERENCE_TARGET, receiver] as? ClassDescriptor)?.kind == ClassKind.OBJECT
}
}
}