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

Introduce "flatMap { it } -> flatten" inspection #KT-25969 Fixed

Browse Source
This commit is contained in:
Toshiaki Kameyama
2018-08-09 17:25:56 +03:00
committed by Mikhail Glukhikh
parent cdcc588a55
commit 2c71b3873e
20 changed files with 201 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/resources/inspectionDescriptions/ConvertFlatMapToFlatten.html
+5
View File
@@ -0,0 +1,5 @@
<html>
<body>
This inspection reports <b>flatMap</b> call should be simplified to <b>flatten()<b>, e.g. <b>flatMap { it }</b> to <b>flatten()</b>.
</body>
</html>
idea/src/META-INF/plugin.xml
+9
View File
@@ -3039,6 +3039,15 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
language="kotlin" language="kotlin"
/> />
<localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.collections.ConvertFlatMapToFlattenInspection"
displayName="flatMap call should be simplified to flatten()"
groupPath="Kotlin"
groupName="Style issues"
enabledByDefault="true"
level="WEAK WARNING"
language="kotlin"
/>
<referenceImporter implementation="org.jetbrains.kotlin.idea.quickfix.KotlinReferenceImporter"/> <referenceImporter implementation="org.jetbrains.kotlin.idea.quickfix.KotlinReferenceImporter"/>
<fileType.fileViewProviderFactory filetype="KJSM" implementationClass="com.intellij.psi.ClassFileViewProviderFactory"/> <fileType.fileViewProviderFactory filetype="KJSM" implementationClass="com.intellij.psi.ClassFileViewProviderFactory"/>
idea/src/META-INF/plugin.xml.173
+9
View File
@@ -3037,6 +3037,15 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
language="kotlin" language="kotlin"
/> />
<localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.collections.ConvertFlatMapToFlattenInspection"
displayName="flatMap call should be simplified to flatten()"
groupPath="Kotlin"
groupName="Style issues"
enabledByDefault="true"
level="WEAK WARNING"
language="kotlin"
/>
<referenceImporter implementation="org.jetbrains.kotlin.idea.quickfix.KotlinReferenceImporter"/> <referenceImporter implementation="org.jetbrains.kotlin.idea.quickfix.KotlinReferenceImporter"/>
<fileType.fileViewProviderFactory filetype="KJSM" implementationClass="com.intellij.psi.ClassFileViewProviderFactory"/> <fileType.fileViewProviderFactory filetype="KJSM" implementationClass="com.intellij.psi.ClassFileViewProviderFactory"/>
idea/src/META-INF/plugin.xml.181
+9
View File
@@ -3038,6 +3038,15 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
language="kotlin" language="kotlin"
/> />
<localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.collections.ConvertFlatMapToFlattenInspection"
displayName="flatMap call should be simplified to flatten()"
groupPath="Kotlin"
groupName="Style issues"
enabledByDefault="true"
level="WEAK WARNING"
language="kotlin"
/>
<referenceImporter implementation="org.jetbrains.kotlin.idea.quickfix.KotlinReferenceImporter"/> <referenceImporter implementation="org.jetbrains.kotlin.idea.quickfix.KotlinReferenceImporter"/>
<fileType.fileViewProviderFactory filetype="KJSM" implementationClass="com.intellij.psi.ClassFileViewProviderFactory"/> <fileType.fileViewProviderFactory filetype="KJSM" implementationClass="com.intellij.psi.ClassFileViewProviderFactory"/>
idea/src/META-INF/plugin.xml.183
+9
View File
@@ -3039,6 +3039,15 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
language="kotlin" language="kotlin"
/> />
<localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.collections.ConvertFlatMapToFlattenInspection"
displayName="flatMap call should be simplified to flatten()"
groupPath="Kotlin"
groupName="Style issues"
enabledByDefault="true"
level="WEAK WARNING"
language="kotlin"
/>
<referenceImporter implementation="org.jetbrains.kotlin.idea.quickfix.KotlinReferenceImporter"/> <referenceImporter implementation="org.jetbrains.kotlin.idea.quickfix.KotlinReferenceImporter"/>
<fileType.fileViewProviderFactory filetype="KJSM" implementationClass="com.intellij.psi.ClassFileViewProviderFactory"/> <fileType.fileViewProviderFactory filetype="KJSM" implementationClass="com.intellij.psi.ClassFileViewProviderFactory"/>
idea/src/META-INF/plugin.xml.as31
+9
View File
@@ -3037,6 +3037,15 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
language="kotlin" language="kotlin"
/> />
<localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.collections.ConvertFlatMapToFlattenInspection"
displayName="flatMap call should be simplified to flatten()"
groupPath="Kotlin"
groupName="Style issues"
enabledByDefault="true"
level="WEAK WARNING"
language="kotlin"
/>
<referenceImporter implementation="org.jetbrains.kotlin.idea.quickfix.KotlinReferenceImporter"/> <referenceImporter implementation="org.jetbrains.kotlin.idea.quickfix.KotlinReferenceImporter"/>
<fileType.fileViewProviderFactory filetype="KJSM" implementationClass="com.intellij.psi.ClassFileViewProviderFactory"/> <fileType.fileViewProviderFactory filetype="KJSM" implementationClass="com.intellij.psi.ClassFileViewProviderFactory"/>
idea/src/META-INF/plugin.xml.as32
+9
View File
@@ -3037,6 +3037,15 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
language="kotlin" language="kotlin"
/> />
<localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.collections.ConvertFlatMapToFlattenInspection"
displayName="flatMap call should be simplified to flatten()"
groupPath="Kotlin"
groupName="Style issues"
enabledByDefault="true"
level="WEAK WARNING"
language="kotlin"
/>
<referenceImporter implementation="org.jetbrains.kotlin.idea.quickfix.KotlinReferenceImporter"/> <referenceImporter implementation="org.jetbrains.kotlin.idea.quickfix.KotlinReferenceImporter"/>
<fileType.fileViewProviderFactory filetype="KJSM" implementationClass="com.intellij.psi.ClassFileViewProviderFactory"/> <fileType.fileViewProviderFactory filetype="KJSM" implementationClass="com.intellij.psi.ClassFileViewProviderFactory"/>
idea/src/META-INF/plugin.xml.as33
+9
View File
@@ -3039,6 +3039,15 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
language="kotlin" language="kotlin"
/> />
<localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.collections.ConvertFlatMapToFlattenInspection"
displayName="flatMap call should be simplified to flatten()"
groupPath="Kotlin"
groupName="Style issues"
enabledByDefault="true"
level="WEAK WARNING"
language="kotlin"
/>
<referenceImporter implementation="org.jetbrains.kotlin.idea.quickfix.KotlinReferenceImporter"/> <referenceImporter implementation="org.jetbrains.kotlin.idea.quickfix.KotlinReferenceImporter"/>
<fileType.fileViewProviderFactory filetype="KJSM" implementationClass="com.intellij.psi.ClassFileViewProviderFactory"/> <fileType.fileViewProviderFactory filetype="KJSM" implementationClass="com.intellij.psi.ClassFileViewProviderFactory"/>
idea/src/org/jetbrains/kotlin/idea/inspections/collections/ConvertFlatMapToFlattenInspection.kt
+57
View File
@@ -0,0 +1,57 @@
/*
* Copyright 2010-2018 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.collections
import com.intellij.codeInspection.LocalQuickFix
import com.intellij.codeInspection.ProblemDescriptor
import com.intellij.codeInspection.ProblemHighlightType
import com.intellij.codeInspection.ProblemsHolder
import com.intellij.openapi.project.Project
import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.inspections.AbstractKotlinInspection
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
class ConvertFlatMapToFlattenInspection : AbstractKotlinInspection() {
override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean) =
qualifiedExpressionVisitor(fun(expression) {
val callExpression = expression.selectorExpression as? KtCallExpression ?: return
val calleeExpression = callExpression.calleeExpression ?: return
if (calleeExpression.text != "flatMap") return
val context = expression.analyze(BodyResolveMode.PARTIAL)
if (FqName("kotlin.collections.flatMap") != callExpression.getResolvedCall(context)?.resultingDescriptor?.fqNameSafe) return
val argument = callExpression.valueArguments.singleOrNull() ?: return
val lambdaExpression = (argument as? KtLambdaArgument)?.getLambdaExpression()
?: argument.getArgumentExpression() as? KtLambdaExpression
?: return
val reference = lambdaExpression.bodyExpression?.statements?.singleOrNull() as? KtNameReferenceExpression ?: return
val lambdaParameters = lambdaExpression.valueParameters
val lambdaParameterName = if (lambdaParameters.isNotEmpty()) lambdaParameters.singleOrNull()?.name else "it"
if (reference.text != lambdaParameterName) return
holder.registerProblem(
calleeExpression,
"flatMap call should be simplified to flatten()",
ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
ConvertFlatMapToFlattenFix()
)
})
}
private class ConvertFlatMapToFlattenFix : LocalQuickFix {
override fun getName() = "Convert flatMap to flatten"
override fun getFamilyName() = name
override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
val callExpression = descriptor.psiElement.parent as? KtCallExpression ?: return
callExpression.replace(KtPsiFactory(callExpression).createExpression("flatten()"))
}
}
idea/testData/inspectionsLocal/collections/convertFlatMapToFlatten/.inspection
Vendored
+1
View File
@@ -0,0 +1 @@
org.jetbrains.kotlin.idea.inspections.collections.ConvertFlatMapToFlattenInspection
idea/testData/inspectionsLocal/collections/convertFlatMapToFlatten/explicitLambdaParameter.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
// WITH_RUNTIME
fun test() {
listOf(listOf(1)).<caret>flatMap { i -> i }
}
idea/testData/inspectionsLocal/collections/convertFlatMapToFlatten/explicitLambdaParameter.kt.after
Vendored
+4
View File
@@ -0,0 +1,4 @@
// WITH_RUNTIME
fun test() {
listOf(listOf(1)).flatten()
}
idea/testData/inspectionsLocal/collections/convertFlatMapToFlatten/notOnlyReference.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
// PROBLEM: none
// WITH_RUNTIME
fun test() {
listOf(listOf(1)).flatMap<caret> { it + 1 }
}
idea/testData/inspectionsLocal/collections/convertFlatMapToFlatten/set.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
// WITH_RUNTIME
fun test() {
setOf(setOf(1)).<caret>flatMap { it }
}
idea/testData/inspectionsLocal/collections/convertFlatMapToFlatten/set.kt.after
Vendored
+4
View File
@@ -0,0 +1,4 @@
// WITH_RUNTIME
fun test() {
setOf(setOf(1)).flatten()
}
idea/testData/inspectionsLocal/collections/convertFlatMapToFlatten/simple.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
// WITH_RUNTIME
fun test() {
listOf(listOf(1)).flatMap<caret> { it }
}
idea/testData/inspectionsLocal/collections/convertFlatMapToFlatten/simple.kt.after
Vendored
+4
View File
@@ -0,0 +1,4 @@
// WITH_RUNTIME
fun test() {
listOf(listOf(1)).flatten()
}
idea/testData/inspectionsLocal/collections/convertFlatMapToFlatten/simple2.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
// WITH_RUNTIME
fun test() {
listOf(listOf(1)).flatMap<caret>({ it })
}
idea/testData/inspectionsLocal/collections/convertFlatMapToFlatten/simple2.kt.after
Vendored
+4
View File
@@ -0,0 +1,4 @@
// WITH_RUNTIME
fun test() {
listOf(listOf(1)).flatten()
}
idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
Generated
+38
View File
@@ -953,6 +953,44 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest {
} }
} }
@TestMetadata("idea/testData/inspectionsLocal/collections/convertFlatMapToFlatten")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class ConvertFlatMapToFlatten extends AbstractLocalInspectionTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
}
public void testAllFilesPresentInConvertFlatMapToFlatten() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/inspectionsLocal/collections/convertFlatMapToFlatten"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
}
@TestMetadata("explicitLambdaParameter.kt")
public void testExplicitLambdaParameter() throws Exception {
runTest("idea/testData/inspectionsLocal/collections/convertFlatMapToFlatten/explicitLambdaParameter.kt");
}
@TestMetadata("notOnlyReference.kt")
public void testNotOnlyReference() throws Exception {
runTest("idea/testData/inspectionsLocal/collections/convertFlatMapToFlatten/notOnlyReference.kt");
}
@TestMetadata("set.kt")
public void testSet() throws Exception {
runTest("idea/testData/inspectionsLocal/collections/convertFlatMapToFlatten/set.kt");
}
@TestMetadata("simple.kt")
public void testSimple() throws Exception {
runTest("idea/testData/inspectionsLocal/collections/convertFlatMapToFlatten/simple.kt");
}
@TestMetadata("simple2.kt")
public void testSimple2() throws Exception {
runTest("idea/testData/inspectionsLocal/collections/convertFlatMapToFlatten/simple2.kt");
}
}
@TestMetadata("idea/testData/inspectionsLocal/collections/simplifiableCallChain") @TestMetadata("idea/testData/inspectionsLocal/collections/simplifiableCallChain")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)