Add inspection "Map replaceable with EnumMap" #KT-25439 Fixed
This commit is contained in:
Dereck Bridie
committed by
Mikhail Glukhikh
Mikhail Glukhikh
parent
607325c6e5
commit
d86ffd3f34
@@ -2374,6 +2374,15 @@
|
|||||||
language="kotlin"
|
language="kotlin"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.ReplaceWithEnumMapInspection"
|
||||||
|
displayName="Replace with EnumMap"
|
||||||
|
groupPath="Kotlin"
|
||||||
|
groupName="Other problems"
|
||||||
|
enabledByDefault="true"
|
||||||
|
level="WARNING"
|
||||||
|
language="kotlin"
|
||||||
|
/>
|
||||||
|
|
||||||
<localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.DataClassPrivateConstructorInspection"
|
<localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.DataClassPrivateConstructorInspection"
|
||||||
displayName="Private data class constructor is exposed via the 'copy' method"
|
displayName="Private data class constructor is exposed via the 'copy' method"
|
||||||
groupPath="Kotlin"
|
groupPath="Kotlin"
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
<html>
|
||||||
|
<body>
|
||||||
|
This inspection reports <b>hashMapOf</b> and similar function calls replaceable with the constructor of <b>EnumMap</b>.
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
|
||||||
|
* that can be found in the license/LICENSE.txt file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.jetbrains.kotlin.idea.inspections
|
||||||
|
|
||||||
|
import com.intellij.codeInspection.LocalQuickFix
|
||||||
|
import com.intellij.codeInspection.ProblemDescriptor
|
||||||
|
import com.intellij.codeInspection.ProblemsHolder
|
||||||
|
import com.intellij.openapi.project.Project
|
||||||
|
import com.intellij.psi.PsiElementVisitor
|
||||||
|
import org.jetbrains.kotlin.idea.caches.resolve.analyze
|
||||||
|
import org.jetbrains.kotlin.idea.caches.resolve.resolveImportReference
|
||||||
|
import org.jetbrains.kotlin.idea.project.platform
|
||||||
|
import org.jetbrains.kotlin.idea.util.ImportInsertHelper
|
||||||
|
import org.jetbrains.kotlin.name.FqName
|
||||||
|
import org.jetbrains.kotlin.psi.KtCallExpression
|
||||||
|
import org.jetbrains.kotlin.psi.KtPsiFactory
|
||||||
|
import org.jetbrains.kotlin.psi.callExpressionVisitor
|
||||||
|
import org.jetbrains.kotlin.psi.createExpressionByPattern
|
||||||
|
import org.jetbrains.kotlin.resolve.BindingContext
|
||||||
|
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
|
||||||
|
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
|
||||||
|
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
|
||||||
|
import org.jetbrains.kotlin.types.typeUtil.isEnum
|
||||||
|
|
||||||
|
private val hashMapCreationFqNames = setOf(
|
||||||
|
"java.util.HashMap.<init>",
|
||||||
|
"kotlin.collections.HashMap.<init>",
|
||||||
|
"kotlin.collections.hashMapOf"
|
||||||
|
)
|
||||||
|
|
||||||
|
class ReplaceWithEnumMapInspection : AbstractKotlinInspection() {
|
||||||
|
override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor {
|
||||||
|
return callExpressionVisitor(fun(element: KtCallExpression) {
|
||||||
|
if (element.platform !is JvmPlatform) return
|
||||||
|
val context = element.analyze()
|
||||||
|
val fqName = element.getResolvedCall(context)?.resultingDescriptor?.fqNameUnsafe?.asString() ?: return
|
||||||
|
if (!hashMapCreationFqNames.contains(fqName)) return
|
||||||
|
if (element.valueArguments.isNotEmpty()) return
|
||||||
|
|
||||||
|
val expectedType = context[BindingContext.EXPECTED_EXPRESSION_TYPE, element] ?: return
|
||||||
|
val firstArgType = expectedType.arguments.firstOrNull()?.type ?: return
|
||||||
|
if (!firstArgType.isEnum()) return
|
||||||
|
val enumClassName = firstArgType.constructor.declarationDescriptor?.fqNameUnsafe?.asString() ?: return
|
||||||
|
holder.registerProblem(element, "Replaceable with EnumMap", ReplaceWithEnumMapFix(enumClassName))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
private class ReplaceWithEnumMapFix(
|
||||||
|
private val enumClassName: String
|
||||||
|
) : LocalQuickFix {
|
||||||
|
override fun getFamilyName() = name
|
||||||
|
|
||||||
|
override fun getName() = "Replace with EnumMap"
|
||||||
|
|
||||||
|
override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
|
||||||
|
val call = descriptor.psiElement as? KtCallExpression ?: return
|
||||||
|
val factory = KtPsiFactory(call)
|
||||||
|
val file = call.containingKtFile
|
||||||
|
val enumMapDescriptor = file.resolveImportReference(FqName("java.util.EnumMap")).firstOrNull() ?: return
|
||||||
|
ImportInsertHelper.getInstance(project).importDescriptor(call.containingKtFile, enumMapDescriptor)
|
||||||
|
call.replace(factory.createExpressionByPattern("EnumMap($0::class.java)", enumClassName))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
org.jetbrains.kotlin.idea.inspections.ReplaceWithEnumMapInspection
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
// RUNTIME_WITH_FULL_JDK
|
||||||
|
|
||||||
|
enum class E {
|
||||||
|
A, B
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getMap(): Map<E, String> = <caret>hashMapOf()
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
import java.util.EnumMap
|
||||||
|
|
||||||
|
// RUNTIME_WITH_FULL_JDK
|
||||||
|
|
||||||
|
enum class E {
|
||||||
|
A, B
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getMap(): Map<E, String> = EnumMap(E::class.java)
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
// RUNTIME_WITH_FULL_JDK
|
||||||
|
import java.util.HashMap
|
||||||
|
|
||||||
|
enum class E {
|
||||||
|
A, B
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getMap(): Map<E, String> = <caret>HashMap()
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
// RUNTIME_WITH_FULL_JDK
|
||||||
|
import java.util.EnumMap
|
||||||
|
import java.util.HashMap
|
||||||
|
|
||||||
|
enum class E {
|
||||||
|
A, B
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getMap(): Map<E, String> = EnumMap(E::class.java)
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
// PROBLEM: none
|
||||||
|
// WITH_RUNTIME
|
||||||
|
|
||||||
|
enum class E {
|
||||||
|
A, B
|
||||||
|
}
|
||||||
|
|
||||||
|
fun main() {
|
||||||
|
val map = <caret>hashMapOf<E, String>()
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
// RUNTIME_WITH_FULL_JDK
|
||||||
|
|
||||||
|
enum class E {
|
||||||
|
A, B
|
||||||
|
}
|
||||||
|
|
||||||
|
fun main() {
|
||||||
|
val test: Map<E, String> = <caret>HashMap()
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
import java.util.EnumMap
|
||||||
|
|
||||||
|
// RUNTIME_WITH_FULL_JDK
|
||||||
|
|
||||||
|
enum class E {
|
||||||
|
A, B
|
||||||
|
}
|
||||||
|
|
||||||
|
fun main() {
|
||||||
|
val test: Map<E, String> = EnumMap(E::class.java)
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
// PROBLEM: none
|
||||||
|
// WITH_RUNTIME
|
||||||
|
|
||||||
|
fun main() {
|
||||||
|
val map = <caret>hashMapOf(5 to 1)
|
||||||
|
}
|
||||||
+38
@@ -7646,6 +7646,44 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("idea/testData/inspectionsLocal/replaceWithEnumMap")
|
||||||
|
@TestDataPath("$PROJECT_ROOT")
|
||||||
|
@RunWith(JUnit3RunnerWithInners.class)
|
||||||
|
public static class ReplaceWithEnumMap extends AbstractLocalInspectionTest {
|
||||||
|
private void runTest(String testDataFilePath) throws Exception {
|
||||||
|
KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testAllFilesPresentInReplaceWithEnumMap() throws Exception {
|
||||||
|
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/inspectionsLocal/replaceWithEnumMap"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("inferred.kt")
|
||||||
|
public void testInferred() throws Exception {
|
||||||
|
runTest("idea/testData/inspectionsLocal/replaceWithEnumMap/inferred.kt");
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("javaCollection.kt")
|
||||||
|
public void testJavaCollection() throws Exception {
|
||||||
|
runTest("idea/testData/inspectionsLocal/replaceWithEnumMap/javaCollection.kt");
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("noInfer.kt")
|
||||||
|
public void testNoInfer() throws Exception {
|
||||||
|
runTest("idea/testData/inspectionsLocal/replaceWithEnumMap/noInfer.kt");
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("simple.kt")
|
||||||
|
public void testSimple() throws Exception {
|
||||||
|
runTest("idea/testData/inspectionsLocal/replaceWithEnumMap/simple.kt");
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("withArguments.kt")
|
||||||
|
public void testWithArguments() throws Exception {
|
||||||
|
runTest("idea/testData/inspectionsLocal/replaceWithEnumMap/withArguments.kt");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("idea/testData/inspectionsLocal/replaceWithOperatorAssignment")
|
@TestMetadata("idea/testData/inspectionsLocal/replaceWithOperatorAssignment")
|
||||||
@TestDataPath("$PROJECT_ROOT")
|
@TestDataPath("$PROJECT_ROOT")
|
||||||
@RunWith(JUnit3RunnerWithInners.class)
|
@RunWith(JUnit3RunnerWithInners.class)
|
||||||
|
|||||||
Reference in New Issue
Block a user