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

Suggest to replace 'substring' calls by take/drop/dropLast calls when possible

Browse Source 
Code review fixes
#KT-10196 Fixed
This commit is contained in:
Anton Sukhonosenko
2016-01-14 22:40:50 +03:00
parent ba0efda2f0
commit b2e98e9353
23 changed files with 87 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/resources/intentionDescriptions/ReplaceSubstringWithDropIntention/after.kt.template
-1
View File
@@ -1 +0,0 @@
s.<spot>drop(5)</spot>
idea/resources/intentionDescriptions/ReplaceSubstringWithDropIntention/before.kt.template
-1
View File
@@ -1 +0,0 @@
s.<spot>substring(5)</spot>
idea/resources/intentionDescriptions/ReplaceSubstringWithDropIntention/description.html
-5
View File
@@ -1,5 +0,0 @@
<html>
<body>
This intention replaces 'substring' call with 'drop' call.
</body>
</html>
idea/resources/intentionDescriptions/ReplaceSubstringWithDropLastIntention/description.html
+1 -1
View File
@@ -1,5 +1,5 @@
<html> <html>
<body> <body>
This intention replaces 'substring' call with 'dropLast' call. This intention replaces call like <code>s.substring(0, s.length - x)</code> with <code>s.dropLast(x)</code> call.
</body> </body>
</html> </html>
idea/resources/intentionDescriptions/ReplaceSubstringWithSubstringAfterIntention/description.html
+1 -1
View File
@@ -1,5 +1,5 @@
<html> <html>
<body> <body>
This intention replaces 'substring' and 'indexOf' calls with 'substringAfter' call. This intention replaces call like <code>s.substring(s.indexOf(x))</code> with <code>s.substringAfter(x)</code> call.
</body> </body>
</html> </html>
idea/resources/intentionDescriptions/ReplaceSubstringWithSubstringBeforeIntention/description.html
+1 -1
View File
@@ -1,5 +1,5 @@
<html> <html>
<body> <body>
This intention replaces 'substring' and 'indexOf' calls with 'substringBefore' call. This intention replaces call like <code>s.substring(0, s.indexOf(x))</code> with <code>s.substringBefore(x)</code> call.
</body> </body>
</html> </html>
idea/resources/intentionDescriptions/ReplaceSubstringWithTakeIntention/description.html
+1 -1
View File
@@ -1,5 +1,5 @@
<html> <html>
<body> <body>
This intention replaces 'substring' call with 'take' call. This intention replaces call like <code>s.substring(0, x)</code> with <code>s.take(x)</code> call.
</body> </body>
</html> </html>
idea/src/META-INF/plugin.xml
-5
View File
@@ -880,11 +880,6 @@
<category>Kotlin</category> <category>Kotlin</category>
</intentionAction> </intentionAction>
<intentionAction>
<className>org.jetbrains.kotlin.idea.intentions.ReplaceSubstringWithDropIntention</className>
<category>Kotlin</category>
</intentionAction>
<intentionAction> <intentionAction>
<className>org.jetbrains.kotlin.idea.intentions.ReplaceSubstringWithDropLastIntention</className> <className>org.jetbrains.kotlin.idea.intentions.ReplaceSubstringWithDropLastIntention</className>
<category>Kotlin</category> <category>Kotlin</category>
idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceSubstringIntention.kt
+29 -12
View File
@@ -16,37 +16,54 @@
package org.jetbrains.kotlin.idea.intentions package org.jetbrains.kotlin.idea.intentions
import com.intellij.codeInsight.intention.HighPriorityAction
import com.intellij.openapi.util.TextRange import com.intellij.openapi.util.TextRange
import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.intentions.branchedTransformations.evaluatesTo
import org.jetbrains.kotlin.idea.intentions.branchedTransformations.isStableVariable import org.jetbrains.kotlin.idea.intentions.branchedTransformations.isStableVariable
import org.jetbrains.kotlin.psi.KtConstantExpression import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.KtDotQualifiedExpression import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
abstract class ReplaceSubstringIntention(text: String) : SelfTargetingRangeIntention<KtDotQualifiedExpression>(KtDotQualifiedExpression::class.java, text), HighPriorityAction { abstract class ReplaceSubstringIntention(text: String) : SelfTargetingRangeIntention<KtDotQualifiedExpression>(KtDotQualifiedExpression::class.java, text) {
protected abstract fun applicabilityRangeInner(element: KtDotQualifiedExpression): TextRange? protected abstract fun applicabilityRangeInner(element: KtDotQualifiedExpression): TextRange?
override fun applicabilityRange(element: KtDotQualifiedExpression): TextRange? { override fun applicabilityRange(element: KtDotQualifiedExpression): TextRange? {
if (!element.receiverExpression.isStableVariable()) return null if (element.receiverExpression.isStableVariable() && element.isMethodCall("kotlin.text.substring")) {
val resolvedCall = element.toResolvedCall(BodyResolveMode.PARTIAL) ?: return null return applicabilityRangeInner(element)
if (resolvedCall.resultingDescriptor.fqNameUnsafe.asString() != "kotlin.text.substring") return null }
return applicabilityRangeInner(element) return null
}
protected fun isIndexOfCall(expression: KtExpression?, expectedReceiver: KtExpression): Boolean {
return expression is KtDotQualifiedExpression
&& expression.isMethodCall("kotlin.text.indexOf")
&& expression.receiverExpression.evaluatesTo(expectedReceiver)
&& expression.callExpression!!.valueArguments.size == 1
}
private fun KtDotQualifiedExpression.isMethodCall(fqMethodName: String): Boolean {
val resolvedCall = toResolvedCall(BodyResolveMode.PARTIAL) ?: return false
return resolvedCall.resultingDescriptor.fqNameUnsafe.asString() == fqMethodName
} }
protected fun KtDotQualifiedExpression.isFirstArgumentZero(): Boolean { protected fun KtDotQualifiedExpression.isFirstArgumentZero(): Boolean {
val resolvedCall = toResolvedCall(BodyResolveMode.PARTIAL) ?: return false val bindingContext = analyze()
val resolvedCall = callExpression.getResolvedCall(bindingContext) ?: return false
val expression = resolvedCall.call.valueArguments[0].getArgumentExpression() as? KtConstantExpression ?: return false val expression = resolvedCall.call.valueArguments[0].getArgumentExpression() as? KtConstantExpression ?: return false
val bindingContext = expression.analyze()
val constant = ConstantExpressionEvaluator.getConstant(expression, bindingContext) ?: return false val constant = ConstantExpressionEvaluator.getConstant(expression, bindingContext) ?: return false
val constantType = bindingContext.getType(expression) ?: return false val constantType = bindingContext.getType(expression) ?: return false
return constant.getValue(constantType) == 0 return constant.getValue(constantType) == 0
} }
protected fun getTextRange(element: KtDotQualifiedExpression): TextRange? { protected fun getTextRange(element: KtDotQualifiedExpression): TextRange? {
return element.callExpression!!.textRange return element.callExpression?.textRange
} }
}
protected fun KtDotQualifiedExpression.replaceWith(pattern: String, argument: KtExpression) {
val psiFactory = KtPsiFactory(this)
replace(psiFactory.createExpressionByPattern(pattern, receiverExpression, argument))
}
}
idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceSubstringWithDropIntention.kt
-39
View File
@@ -1,39 +0,0 @@
/*
* Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.kotlin.idea.intentions
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.util.TextRange
import org.jetbrains.kotlin.psi.KtDotQualifiedExpression
import org.jetbrains.kotlin.psi.KtPsiFactory
import org.jetbrains.kotlin.psi.createExpressionByPattern
class ReplaceSubstringWithDropIntention : ReplaceSubstringIntention("Replace 'substring' call with 'drop' call") {
override fun applicabilityRangeInner(element: KtDotQualifiedExpression): TextRange? {
val arguments = element.callExpression?.valueArguments ?: return null
if (arguments.count() != 1) return null
return getTextRange(element)
}
override fun applyTo(element: KtDotQualifiedExpression, editor: Editor?) {
val receiver = element.receiverExpression
val argument = element.callExpression!!.valueArguments[0].getArgumentExpression()!!
val psiFactory = KtPsiFactory(element)
element.replace(psiFactory.createExpressionByPattern("$0.drop($1)", receiver, argument))
}
}
idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceSubstringWithDropLastIntention.kt
+2 -4
View File
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.*
class ReplaceSubstringWithDropLastIntention : ReplaceSubstringIntention("Replace 'substring' call with 'dropLast' call") { class ReplaceSubstringWithDropLastIntention : ReplaceSubstringIntention("Replace 'substring' call with 'dropLast' call") {
override fun applicabilityRangeInner(element: KtDotQualifiedExpression): TextRange? { override fun applicabilityRangeInner(element: KtDotQualifiedExpression): TextRange? {
val arguments = element.callExpression?.valueArguments ?: return null val arguments = element.callExpression?.valueArguments ?: return null
if (arguments.count() != 2 || !element.isFirstArgumentZero()) return null if (arguments.size != 2 || !element.isFirstArgumentZero()) return null
val secondArgumentExpression = arguments[1].getArgumentExpression() val secondArgumentExpression = arguments[1].getArgumentExpression()
@@ -39,12 +39,10 @@ class ReplaceSubstringWithDropLastIntention : ReplaceSubstringIntention("Replace
} }
override fun applyTo(element: KtDotQualifiedExpression, editor: Editor?) { override fun applyTo(element: KtDotQualifiedExpression, editor: Editor?) {
val receiver = element.receiverExpression
val argument = element.callExpression!!.valueArguments[1].getArgumentExpression()!! val argument = element.callExpression!!.valueArguments[1].getArgumentExpression()!!
val rightExpression = (argument as KtBinaryExpression).right!! val rightExpression = (argument as KtBinaryExpression).right!!
val psiFactory = KtPsiFactory(element) element.replaceWith("$0.dropLast($1)", rightExpression)
element.replace(psiFactory.createExpressionByPattern("$0.dropLast($1)", receiver, rightExpression))
} }
private fun isLengthAccess(expression: KtExpression?, expectedReceiver: KtExpression): Boolean { private fun isLengthAccess(expression: KtExpression?, expectedReceiver: KtExpression): Boolean {
idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceSubstringWithSubstringBeforeAfterIntentions.kt
+2 -17
View File
@@ -27,7 +27,7 @@ class ReplaceSubstringWithSubstringAfterIntention : ReplaceSubstringIntention("R
override fun applicabilityRangeInner(element: KtDotQualifiedExpression): TextRange? { override fun applicabilityRangeInner(element: KtDotQualifiedExpression): TextRange? {
val arguments = element.callExpression?.valueArguments ?: return null val arguments = element.callExpression?.valueArguments ?: return null
if (arguments.count() == 1 && isIndexOfCall(arguments[0].getArgumentExpression(), element.receiverExpression)) { if (arguments.size == 1 && isIndexOfCall(arguments[0].getArgumentExpression(), element.receiverExpression)) {
return getTextRange(element) return getTextRange(element)
} }
@@ -45,7 +45,7 @@ class ReplaceSubstringWithSubstringBeforeIntention : ReplaceSubstringIntention("
override fun applicabilityRangeInner(element: KtDotQualifiedExpression): TextRange? { override fun applicabilityRangeInner(element: KtDotQualifiedExpression): TextRange? {
val arguments = element.callExpression?.valueArguments ?: return null val arguments = element.callExpression?.valueArguments ?: return null
if (arguments.count() == 2 if (arguments.size == 2
&& element.isFirstArgumentZero() && element.isFirstArgumentZero()
&& isIndexOfCall(arguments[1].getArgumentExpression(), element.receiverExpression)) { && isIndexOfCall(arguments[1].getArgumentExpression(), element.receiverExpression)) {
return getTextRange(element) return getTextRange(element)
@@ -61,21 +61,6 @@ class ReplaceSubstringWithSubstringBeforeIntention : ReplaceSubstringIntention("
} }
} }
private fun KtDotQualifiedExpression.replaceWith(pattern: String, argument: KtExpression) {
val psiFactory = KtPsiFactory(this)
replace(psiFactory.createExpressionByPattern(pattern, receiverExpression, argument))
}
private fun KtDotQualifiedExpression.getArgumentExpression(index: Int): KtExpression { private fun KtDotQualifiedExpression.getArgumentExpression(index: Int): KtExpression {
return callExpression!!.valueArguments[index].getArgumentExpression()!! return callExpression!!.valueArguments[index].getArgumentExpression()!!
} }
private fun isIndexOfCall(expression: KtExpression?, expectedReceiver: KtExpression): Boolean {
if (expression !is KtDotQualifiedExpression) return false
val resolvedCall = expression.toResolvedCall(BodyResolveMode.PARTIAL) ?: return false
if (resolvedCall.resultingDescriptor.fqNameUnsafe.asString() != "kotlin.text.indexOf") return false
if (!expression.receiverExpression.evaluatesTo(expectedReceiver)) return false
return expression.callExpression!!.valueArguments.count() == 1
}
idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceSubstringWithTakeIntention.kt
+2 -5
View File
@@ -25,17 +25,14 @@ import org.jetbrains.kotlin.psi.createExpressionByPattern
class ReplaceSubstringWithTakeIntention : ReplaceSubstringIntention("Replace 'substring' call with 'take' call") { class ReplaceSubstringWithTakeIntention : ReplaceSubstringIntention("Replace 'substring' call with 'take' call") {
override fun applicabilityRangeInner(element: KtDotQualifiedExpression): TextRange? { override fun applicabilityRangeInner(element: KtDotQualifiedExpression): TextRange? {
val arguments = element.callExpression?.valueArguments ?: return null val arguments = element.callExpression?.valueArguments ?: return null
if (arguments.count() == 2 && element.isFirstArgumentZero()) { if (arguments.size == 2 && element.isFirstArgumentZero()) {
return getTextRange(element) return getTextRange(element)
} }
return null return null
} }
override fun applyTo(element: KtDotQualifiedExpression, editor: Editor?) { override fun applyTo(element: KtDotQualifiedExpression, editor: Editor?) {
val receiver = element.receiverExpression
val argument = element.callExpression!!.valueArguments[1].getArgumentExpression()!! val argument = element.callExpression!!.valueArguments[1].getArgumentExpression()!!
element.replaceWith("$0.take($1)", argument)
val psiFactory = KtPsiFactory(element)
element.replace(psiFactory.createExpressionByPattern("$0.take($1)", receiver, argument))
} }
} }
idea/testData/intentions/replaceSubstringWithDrop/.intention
Vendored
-1
View File
@@ -1 +0,0 @@
org.jetbrains.kotlin.idea.intentions.ReplaceSubstringWithDropIntention
idea/testData/intentions/replaceSubstringWithDrop/replaceWithDrop.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
// WITH_RUNTIME
fun foo(s: String) {
s.substring<caret>(4)
}
idea/testData/intentions/replaceSubstringWithDrop/replaceWithDrop.kt.after
Vendored
-5
View File
@@ -1,5 +0,0 @@
// WITH_RUNTIME
fun foo(s: String) {
s.drop(4)
}
idea/testData/intentions/replaceSubstringWithDrop/semicolon.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
// WITH_RUNTIME
fun foo(s: String) {
s.substring<caret>(4);
}
idea/testData/intentions/replaceSubstringWithDrop/semicolon.kt.after
Vendored
-5
View File
@@ -1,5 +0,0 @@
// WITH_RUNTIME
fun foo(s: String) {
s.drop(4);
}
idea/testData/intentions/replaceSubstringWithDrop/substringWithTwoArguments.kt
Vendored
-6
View File
@@ -1,6 +0,0 @@
// IS_APPLICABLE: false
// WITH_RUNTIME
fun foo(s: String) {
s.substring<caret>(0, 10)
}
idea/testData/intentions/replaceSubstringWithDropLast/methodCallReceiver.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
// WITH_RUNTIME
// IS_APPLICABLE: false
class A() {
fun bar(): String = null!!
}
fun foo(a: A) {
a.bar().substring<caret>(0, a.bar().length - 5)
}
idea/testData/intentions/replaceSubstringWithSubstringAfter/methodCallReceiver.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
// WITH_RUNTIME
// IS_APPLICABLE: false
class A() {
fun bar(): String = null!!
}
fun foo(a: A) {
a.bar().substring<caret>(a.bar().indexOf('x'))
}
idea/testData/intentions/replaceSubstringWithSubstringBefore/methodCallReceiver.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
// WITH_RUNTIME
// IS_APPLICABLE: false
class A() {
fun bar(): String = null!!
}
fun foo(a: A) {
a.bar().substring<caret>(0, a.bar().indexOf('x'))
}
idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+18 -27
View File
@@ -7573,33 +7573,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
} }
} }
@TestMetadata("idea/testData/intentions/replaceSubstringWithDrop")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class ReplaceSubstringWithDrop extends AbstractIntentionTest {
public void testAllFilesPresentInReplaceSubstringWithDrop() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceSubstringWithDrop"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
}
@TestMetadata("replaceWithDrop.kt")
public void testReplaceWithDrop() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceSubstringWithDrop/replaceWithDrop.kt");
doTest(fileName);
}
@TestMetadata("semicolon.kt")
public void testSemicolon() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceSubstringWithDrop/semicolon.kt");
doTest(fileName);
}
@TestMetadata("substringWithTwoArguments.kt")
public void testSubstringWithTwoArguments() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceSubstringWithDrop/substringWithTwoArguments.kt");
doTest(fileName);
}
}
@TestMetadata("idea/testData/intentions/replaceSubstringWithDropLast") @TestMetadata("idea/testData/intentions/replaceSubstringWithDropLast")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
@@ -7614,6 +7587,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
doTest(fileName); doTest(fileName);
} }
@TestMetadata("methodCallReceiver.kt")
public void testMethodCallReceiver() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceSubstringWithDropLast/methodCallReceiver.kt");
doTest(fileName);
}
@TestMetadata("nonZeroFirstArgument.kt") @TestMetadata("nonZeroFirstArgument.kt")
public void testNonZeroFirstArgument() throws Exception { public void testNonZeroFirstArgument() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceSubstringWithDropLast/nonZeroFirstArgument.kt"); String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceSubstringWithDropLast/nonZeroFirstArgument.kt");
@@ -7647,6 +7626,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
doTest(fileName); doTest(fileName);
} }
@TestMetadata("methodCallReceiver.kt")
public void testMethodCallReceiver() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceSubstringWithSubstringAfter/methodCallReceiver.kt");
doTest(fileName);
}
@TestMetadata("replaceWithSubstringAfter.kt") @TestMetadata("replaceWithSubstringAfter.kt")
public void testReplaceWithSubstringAfter() throws Exception { public void testReplaceWithSubstringAfter() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceSubstringWithSubstringAfter/replaceWithSubstringAfter.kt"); String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceSubstringWithSubstringAfter/replaceWithSubstringAfter.kt");
@@ -7674,6 +7659,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
doTest(fileName); doTest(fileName);
} }
@TestMetadata("methodCallReceiver.kt")
public void testMethodCallReceiver() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceSubstringWithSubstringBefore/methodCallReceiver.kt");
doTest(fileName);
}
@TestMetadata("nonZeroFirstArgument.kt") @TestMetadata("nonZeroFirstArgument.kt")
public void testNonZeroFirstArgument() throws Exception { public void testNonZeroFirstArgument() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceSubstringWithSubstringBefore/nonZeroFirstArgument.kt"); String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceSubstringWithSubstringBefore/nonZeroFirstArgument.kt");