Add Intention to replace a..b-1 with a until b and vice versa #KT-13483 Fixed

2016-08-17 21:13:10 +02:00
parent d9358d44e7
commit 354d047533
23 changed files with 261 additions and 0 deletions
@@ -0,0 +1 @@
+a until b
@@ -0,0 +1 @@
+a..b-1
@@ -0,0 +1,5 @@
+<html>
+<body>
+This intention replaces calls to 'rangeTo' or the '..' operator with calls to 'until' and offsets the upper bound by 1.
+</body>
+</html>
@@ -0,0 +1 @@
+a..b-1
@@ -0,0 +1 @@
+a until b
@@ -0,0 +1,5 @@
+<html>
+<body>
+This intention replaces calls to 'until' with the '..' operator and subtracts one from the upper bound.
+</body>
+</html>
@@ -1310,6 +1310,16 @@
      <category>Kotlin</category>
    </intentionAction>

+    <intentionAction>
+      <className>org.jetbrains.kotlin.idea.intentions.ReplaceRangeToWithUntilIntention</className>
+      <category>Kotlin</category>
+    </intentionAction>
+
+    <intentionAction>
+      <className>org.jetbrains.kotlin.idea.intentions.ReplaceUntilWithRangeToIntention</className>
+      <category>Kotlin</category>
+    </intentionAction>
+
    <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.ObjectLiteralToLambdaInspection"
                     displayName="Object literal can be converted to lambda"
                     groupName="Kotlin"
@@ -0,0 +1,83 @@
+/*
+ * 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 org.jetbrains.kotlin.idea.caches.resolve.analyze
+import org.jetbrains.kotlin.lexer.KtTokens
+import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
+import org.jetbrains.kotlin.resolve.calls.callUtil.getType
+import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator
+import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
+import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
+
+private fun KtExpression.getCallableDescriptor() = getResolvedCall(analyze())?.resultingDescriptor
+
+private fun KtExpression.getArguments() = when (this) {
+    is KtBinaryExpression -> this.left to this.right
+    is KtDotQualifiedExpression -> this.receiverExpression to this.callExpression?.valueArguments?.singleOrNull()?.getArgumentExpression()
+    else -> null
+}
+
+private val REGEX_RANGE_TO = """kotlin.(Char|Byte|Short|Int|Long).rangeTo""".toRegex()
+
+class ReplaceRangeToWithUntilIntention : SelfTargetingIntention<KtExpression>(
+        KtExpression::class.java,
+        "Replace with 'until' function call"
+) {
+
+    override fun isApplicableTo(element: KtExpression, caretOffset: Int): Boolean {
+        if (element !is KtBinaryExpression && element !is KtDotQualifiedExpression) return false
+
+        val fqName = element.getCallableDescriptor()?.fqNameUnsafe?.asString() ?: return false
+        if (!fqName.matches(REGEX_RANGE_TO)) return false
+        return element.getArguments()?.second?.isMinusOne() == true
+    }
+
+    override fun applyTo(element: KtExpression, editor: Editor?) {
+        val args = element.getArguments() ?: return
+        element.replace(KtPsiFactory(element).createExpressionByPattern("$0 until $1",
+                                                                        args.first ?: return,
+                                                                        (args.second as? KtBinaryExpression)?.left ?: return))
+    }
+
+    private fun KtExpression.isMinusOne(): Boolean {
+        if (this !is KtBinaryExpression) return false
+        if (operationToken != KtTokens.MINUS) return false
+
+        val right = right as? KtConstantExpression ?: return false
+        val context = right.analyze(BodyResolveMode.PARTIAL)
+        val constantValue = ConstantExpressionEvaluator.getConstant(right, context)?.toConstantValue(right.getType(context) ?: return false)
+        val rightValue = (constantValue?.value as? Number)?.toInt() ?: return false
+        return rightValue == 1
+    }
+
+}
+
+class ReplaceUntilWithRangeToIntention : SelfTargetingIntention<KtExpression>(KtExpression::class.java, "Replace with '..' operator") {
+    override fun isApplicableTo(element: KtExpression, caretOffset: Int): Boolean {
+        if (element !is KtBinaryExpression && element !is KtDotQualifiedExpression) return false
+        val fqName = element.getCallableDescriptor()?.fqNameUnsafe?.asString() ?: return false
+        return fqName == "kotlin.ranges.until"
+    }
+
+    override fun applyTo(element: KtExpression, editor: Editor?) {
+        val args = element.getArguments() ?: return
+        element.replace(KtPsiFactory(element).createExpressionByPattern("$0..$1 - 1", args.first ?: return, args.second ?: return))
+    }
+}
@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.intentions.ReplaceRangeToWithUntilIntention
@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+// IS_APPLICABLE: false
+
+fun foo(a: Float) {
+    1f..a - 1
+}
@@ -0,0 +1,8 @@
+// WITH_RUNTIME
+// IS_APPLICABLE: false
+
+fun foo(a: Int) {
+    for (i in 0..a - 2<caret>) {
+
+    }
+}
@@ -0,0 +1,8 @@
+// WITH_RUNTIME
+// IS_APPLICABLE: false
+
+fun foo(a: Int) {
+    for (i in 0..a<caret>) {
+
+    }
+}
@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+
+fun foo(a: Int) {
+    for (i in 0..a - 1<caret>) {
+
+    }
+}
@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+
+fun foo(a: Int) {
+    for (i in 0 until a<caret>) {
+
+    }
+}
@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+
+fun foo(a: Long) {
+    for (i in 1L..a - 1L<caret>) {
+
+    }
+}
@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+
+fun foo(a: Long) {
+    for (i in 1L until a<caret>) {
+
+    }
+}
@@ -0,0 +1,8 @@
+// WITH_RUNTIME
+// IS_APPLICABLE: false
+
+fun foo(a: Int) {
+    for (i in 0..a + 1<caret>) {
+
+    }
+}
@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+
+fun foo(a: Int) {
+    for (i in 0.rangeTo(a - 1)<caret>) {
+
+    }
+}
@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+
+fun foo(a: Int) {
+    for (i in 0 until a<caret>) {
+
+    }
+}
@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.intentions.ReplaceUntilWithRangeToIntention
@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+
+fun foo(a: Int) {
+    for (i in 0 until a<caret>) {
+
+    }
+}
@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+
+fun foo(a: Int) {
+    for (i in 0..a - 1<caret>) {
+
+    }
+}
@@ -10070,6 +10070,57 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
        }
    }

+    @TestMetadata("idea/testData/intentions/replaceRangeToWithUntil")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class ReplaceRangeToWithUntil extends AbstractIntentionTest {
+        public void testAllFilesPresentInReplaceRangeToWithUntil() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceRangeToWithUntil"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
+        }
+
+        @TestMetadata("closedRange.kt")
+        public void testClosedRange() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceRangeToWithUntil/closedRange.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("minusTwo.kt")
+        public void testMinusTwo() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceRangeToWithUntil/minusTwo.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("notMinusOne.kt")
+        public void testNotMinusOne() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceRangeToWithUntil/notMinusOne.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("operator.kt")
+        public void testOperator() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceRangeToWithUntil/operator.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("operatorLong.kt")
+        public void testOperatorLong() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceRangeToWithUntil/operatorLong.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("plusOne.kt")
+        public void testPlusOne() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceRangeToWithUntil/plusOne.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("rangeTo.kt")
+        public void testRangeTo() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceRangeToWithUntil/rangeTo.kt");
+            doTest(fileName);
+        }
+    }
+
    @TestMetadata("idea/testData/intentions/replaceSubstringWithDropLast")
    @TestDataPath("$PROJECT_ROOT")
    @RunWith(JUnit3RunnerWithInners.class)
@@ -10220,6 +10271,21 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
        }
    }

+    @TestMetadata("idea/testData/intentions/replaceUntilWithRangeTo")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class ReplaceUntilWithRangeTo extends AbstractIntentionTest {
+        public void testAllFilesPresentInReplaceUntilWithRangeTo() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceUntilWithRangeTo"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceUntilWithRangeTo/simple.kt");
+            doTest(fileName);
+        }
+    }
+
    @TestMetadata("idea/testData/intentions/replaceWithOperatorAssignment")
    @TestDataPath("$PROJECT_ROOT")
    @RunWith(JUnit3RunnerWithInners.class)
				`@@ -0,0 +1 @@`
				`org.jetbrains.kotlin.idea.intentions.ReplaceRangeToWithUntilIntention`