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

Minor build fix: "Convert to apply" is now applicable only with 2+ calls with the same receiver

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-03-03 11:10:01 +03:00
parent 634d9834de
commit 3060ecc066
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToApplyIntention.kt
+6 -2
View File
@@ -40,9 +40,13 @@ class ConvertToApplyIntention : ConvertToScopeIntention<KtExpression>(
private fun KtProperty.isApplicable(): Boolean { private fun KtProperty.isApplicable(): Boolean {
if (!isLocal) return false if (!isLocal) return false
val nextSibling = getDotQualifiedSiblingIfAny(forward = true)
val localVariableName = name ?: return false val localVariableName = name ?: return false
return nextSibling != null && isApplicableWithGivenReceiverText(nextSibling, localVariableName) val firstDotQualified = getDotQualifiedSiblingIfAny(forward = true)
if (firstDotQualified != null && isApplicableWithGivenReceiverText(firstDotQualified, localVariableName)) {
val nextDotQualified = firstDotQualified.getDotQualifiedSiblingIfAny(forward = true)
return nextDotQualified != null && isApplicableWithGivenReceiverText(nextDotQualified, localVariableName)
}
return false
} }
private fun KtDotQualifiedExpression.findTargetProperty(receiverExpressionText: String): KtProperty? { private fun KtDotQualifiedExpression.findTargetProperty(receiverExpressionText: String): KtProperty? {