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

Optimize "replace toString() with string template"

Browse Source 
Related to KT-13782
This commit is contained in:
Mikhail Glukhikh
2018-06-20 17:15:41 +03:00
parent 7a1cf5704e
commit e1d223937b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceToStringWithStringTemplateInspection.kt
+4 -1
View File
@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
class ReplaceToStringWithStringTemplateInspection : AbstractApplicabilityBasedInspection<KtDotQualifiedExpression>( class ReplaceToStringWithStringTemplateInspection : AbstractApplicabilityBasedInspection<KtDotQualifiedExpression>(
KtDotQualifiedExpression::class.java KtDotQualifiedExpression::class.java
) { ) {
override fun isApplicable(element: KtDotQualifiedExpression): Boolean { override fun isApplicable(element: KtDotQualifiedExpression): Boolean {
if (element.receiverExpression !is KtReferenceExpression) return false if (element.receiverExpression !is KtReferenceExpression) return false
@@ -39,6 +39,9 @@ class ReplaceToStringWithStringTemplateInspection : AbstractApplicabilityBasedIn
override val defaultFixText = "Replace 'toString' with string template" override val defaultFixText = "Replace 'toString' with string template"
private fun KtDotQualifiedExpression.isToString(): Boolean { private fun KtDotQualifiedExpression.isToString(): Boolean {
val callExpression = selectorExpression as? KtCallExpression ?: return false
val referenceExpression = callExpression.calleeExpression as? KtNameReferenceExpression ?: return false
if (referenceExpression.getReferencedName() != "toString") return false
val resolvedCall = toResolvedCall(BodyResolveMode.PARTIAL) ?: return false val resolvedCall = toResolvedCall(BodyResolveMode.PARTIAL) ?: return false
val callableDescriptor = resolvedCall.resultingDescriptor as? CallableMemberDescriptor ?: return false val callableDescriptor = resolvedCall.resultingDescriptor as? CallableMemberDescriptor ?: return false
return callableDescriptor.getDeepestSuperDeclarations().any { it.fqNameUnsafe.asString() == "kotlin.Any.toString" } return callableDescriptor.getDeepestSuperDeclarations().any { it.fqNameUnsafe.asString() == "kotlin.Any.toString" }