Add inspection/intention for redundant calls of conversion methods #KT-10871 Fixed

Also #KT-12625 Fixed
2016-10-05 13:48:12 +09:00
parent a5d6559056
commit a1f1716044
45 changed files with 325 additions and 0 deletions
@@ -0,0 +1,5 @@
+<html>
+<body>
+This inspection reports redundant calls of the conversion method
+</body>
+</html>
@@ -0,0 +1 @@
+<spot>1</spot>
@@ -0,0 +1 @@
+<spot>1.toInt()</spot>
@@ -0,0 +1,5 @@
+<html>
+<body>
+This intention removes redundant calls of conversion methods.
+</body>
+</html>
@@ -1408,6 +1408,11 @@
      <category>Kotlin</category>
    </intentionAction>

+    <intentionAction>
+      <className>org.jetbrains.kotlin.idea.intentions.RemoveRedundantCallsOfConversionMethodsIntention</className>
+      <category>Kotlin</category>
+    </intentionAction>
+
    <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.ObjectLiteralToLambdaInspection"
                     displayName="Object literal can be converted to lambda"
                     groupName="Kotlin"
@@ -1874,6 +1879,14 @@
                     language="kotlin"
    />

+    <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.RemoveRedundantCallsOfConversionMethodsInspection"
+                     displayName="Remove redundant calls of conversion methods"
+                     groupName="Kotlin"
+                     enabledByDefault="true"
+                     level="WARNING"
+                     language="kotlin"
+    />
+
    <referenceImporter implementation="org.jetbrains.kotlin.idea.quickfix.KotlinReferenceImporter"/>

    <fileType.fileViewProviderFactory filetype="KJSM" implementationClass="com.intellij.psi.ClassFileViewProviderFactory"/>
@@ -0,0 +1,77 @@
+/*
+ * 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.codeInspection.ProblemHighlightType
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.util.TextRange
+import org.jetbrains.kotlin.idea.caches.resolve.analyze
+import org.jetbrains.kotlin.idea.core.replaced
+import org.jetbrains.kotlin.idea.inspections.IntentionBasedInspection
+import org.jetbrains.kotlin.js.descriptorUtils.getJetTypeFqName
+import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
+import org.jetbrains.kotlin.resolve.calls.callUtil.getType
+import java.util.*
+
+class RemoveRedundantCallsOfConversionMethodsInspection : IntentionBasedInspection<KtQualifiedExpression>(RemoveRedundantCallsOfConversionMethodsIntention::class) {
+    override val problemHighlightType = ProblemHighlightType.LIKE_UNUSED_SYMBOL
+}
+
+class RemoveRedundantCallsOfConversionMethodsIntention : SelfTargetingRangeIntention<KtQualifiedExpression>(KtQualifiedExpression::class.java, "Remove redundant calls of the conversion method") {
+
+    private val targetClassMap = mapOf("toList()" to List::class.qualifiedName,
+                                       "toSet()" to Set::class.qualifiedName,
+                                       "toMap()" to Map::class.qualifiedName,
+                                       "toMutableList()" to "kotlin.collections.MutableList",
+                                       "toMutableSet()" to "kotlin.collections.MutableSet",
+                                       "toMutableMap()" to "kotlin.collections.MutableMap",
+                                       "toSortedSet()" to SortedSet::class.qualifiedName,
+                                       "toSortedMap()" to SortedMap::class.qualifiedName,
+                                       "toString()" to String::class.qualifiedName,
+                                       "toDouble()" to Double::class.qualifiedName,
+                                       "toFloat()" to Float::class.qualifiedName,
+                                       "toLong()" to Long::class.qualifiedName,
+                                       "toInt()" to Int::class.qualifiedName,
+                                       "toChar()" to Char::class.qualifiedName,
+                                       "toShort()" to Short::class.qualifiedName,
+                                       "toByte()" to Byte::class.qualifiedName)
+
+
+    override fun applyTo(element: KtQualifiedExpression, editor: Editor?) {
+        element.replaced(element.receiverExpression)
+    }
+
+    override fun applicabilityRange(element: KtQualifiedExpression): TextRange? {
+        val selectorExpression = element.selectorExpression ?: return null
+        val selectorExpressionText = selectorExpression.text
+        val qualifiedName = targetClassMap[selectorExpressionText] ?: return null
+        if(element.receiverExpression.isApplicableReceiverExpression(qualifiedName)) {
+            return selectorExpression.textRange
+        } else {
+            return null
+        }
+    }
+
+    private fun KtExpression.isApplicableReceiverExpression(qualifiedName: String): Boolean {
+        return when (this) {
+            is KtStringTemplateExpression -> String::class.qualifiedName
+            is KtConstantExpression -> getType(analyze())?.getJetTypeFqName(false)
+            else -> getResolvedCall(analyze())?.candidateDescriptor?.returnType?.getJetTypeFqName(false)
+        } == qualifiedName
+    }
+}
@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.intentions.RemoveRedundantCallsOfConversionMethodsIntention
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = Byte.MAX_VALUE.toByte()<caret>
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = Byte.MAX_VALUE
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = 'a'.toChar()<caret>
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = 'a'
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = 1.1.toDouble()<caret>
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = 1.1
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = 1.1f.toFloat()<caret>
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = 1.1f
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = 1.toInt()<caret>
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = 1
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = listOf(1, 2, 3).toList()<caret>
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = listOf(1, 2, 3)
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = listOf(1, 2, 3).map(Int::toString).toList()<caret>
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = listOf(1, 2, 3).map(Int::toString)
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = Long.MAX_VALUE.toLong()<caret>
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = Long.MAX_VALUE
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = mutableListOf(1, 2, 3).toMutableList()<caret>
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = mutableListOf(1, 2, 3)
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = mutableSetOf(1, 2, 3).toMutableSet()<caret>
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = mutableSetOf(1, 2, 3)
@@ -0,0 +1,8 @@
+// WITH_RUNTIME
+
+import java.util.SortedMap
+
+fun test() {
+    val foo: SortedMap<String, String>? = null
+    foo?.toSortedMap()<caret>
+}
@@ -0,0 +1,8 @@
+// WITH_RUNTIME
+
+import java.util.SortedMap
+
+fun test() {
+    val foo: SortedMap<String, String>? = null
+    foo
+}
@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+
+fun test() {
+    val foo: String? = null
+    foo?.toString()<caret>
+}
@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+
+fun test() {
+    val foo: String? = null
+    foo
+}
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = setOf(1, 2, 3).toSet()<caret>
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = setOf(1, 2, 3)
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = Short.MAX_VALUE.toShort<caret>()
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = Short.MAX_VALUE
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = sortedMapOf(1 to 1).toSortedMap()<caret>
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = sortedMapOf(1 to 1)
@@ -0,0 +1,3 @@
+// WITH_RUNTIME
+// sortedSetOf returns TreeSet not SortedSet
+val foo = sortedSetOf(1, 2, 3).toSortedSet().toSortedSet()<caret>
@@ -0,0 +1,3 @@
+// WITH_RUNTIME
+// sortedSetOf returns TreeSet not SortedSet
+val foo = sortedSetOf(1, 2, 3).toSortedSet()
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = "".toString()<caret>
@@ -0,0 +1,2 @@
+// WITH_RUNTIME
+val foo = ""
@@ -0,0 +1,3 @@
+// WITH_RUNTIME
+// IS_APPLICABLE: false
+val foo = 1.toLong()<caret>
@@ -0,0 +1,3 @@
+// WITH_RUNTIME
+val foo = ""
+val bar = foo.toString()<caret>
@@ -0,0 +1,3 @@
+// WITH_RUNTIME
+val foo = ""
+val bar = foo
@@ -10875,6 +10875,129 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
        }
    }

+    @TestMetadata("idea/testData/intentions/removeRedundantCallsOfConversionMethods")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class RemoveRedundantCallsOfConversionMethods extends AbstractIntentionTest {
+        public void testAllFilesPresentInRemoveRedundantCallsOfConversionMethods() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeRedundantCallsOfConversionMethods"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
+        }
+
+        @TestMetadata("byte.kt")
+        public void testByte() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeRedundantCallsOfConversionMethods/byte.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("char.kt")
+        public void testChar() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeRedundantCallsOfConversionMethods/char.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("double.kt")
+        public void testDouble() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeRedundantCallsOfConversionMethods/double.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("float.kt")
+        public void testFloat() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeRedundantCallsOfConversionMethods/float.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("int.kt")
+        public void testInt() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeRedundantCallsOfConversionMethods/int.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("list.kt")
+        public void testList() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeRedundantCallsOfConversionMethods/list.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("list2.kt")
+        public void testList2() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeRedundantCallsOfConversionMethods/list2.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("long.kt")
+        public void testLong() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeRedundantCallsOfConversionMethods/long.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("mutableList.kt")
+        public void testMutableList() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeRedundantCallsOfConversionMethods/mutableList.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("mutableSet.kt")
+        public void testMutableSet() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeRedundantCallsOfConversionMethods/mutableSet.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("safeSortedMap.kt")
+        public void testSafeSortedMap() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeRedundantCallsOfConversionMethods/safeSortedMap.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("safeString.kt")
+        public void testSafeString() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeRedundantCallsOfConversionMethods/safeString.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("set.kt")
+        public void testSet() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeRedundantCallsOfConversionMethods/set.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("short.kt")
+        public void testShort() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeRedundantCallsOfConversionMethods/short.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("sortedMap.kt")
+        public void testSortedMap() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeRedundantCallsOfConversionMethods/sortedMap.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("sortedSet.kt")
+        public void testSortedSet() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeRedundantCallsOfConversionMethods/sortedSet.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("string.kt")
+        public void testString() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeRedundantCallsOfConversionMethods/string.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("toOtherType.kt")
+        public void testToOtherType() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeRedundantCallsOfConversionMethods/toOtherType.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("variable.kt")
+        public void testVariable() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeRedundantCallsOfConversionMethods/variable.kt");
+            doTest(fileName);
+        }
+    }
+
    @TestMetadata("idea/testData/intentions/removeSingleExpressionStringTemplate")
    @TestDataPath("$PROJECT_ROOT")
    @RunWith(JUnit3RunnerWithInners.class)
				`@@ -0,0 +1 @@`
				`org.jetbrains.kotlin.idea.intentions.RemoveRedundantCallsOfConversionMethodsIntention`