Remove redundant spread operator: don't report if overloaded functions cannot be resolved
#KT-38282 Fixed
This commit is contained in:
committed by
Dmitry Gridin
parent
f179b39c70
commit
0a230905ae
+17
@@ -13,11 +13,16 @@ import com.intellij.openapi.project.Project
|
|||||||
import com.intellij.openapi.util.TextRange
|
import com.intellij.openapi.util.TextRange
|
||||||
import com.intellij.psi.PsiElementVisitor
|
import com.intellij.psi.PsiElementVisitor
|
||||||
import org.jetbrains.kotlin.idea.KotlinBundle
|
import org.jetbrains.kotlin.idea.KotlinBundle
|
||||||
|
import org.jetbrains.kotlin.idea.analysis.analyzeAsReplacement
|
||||||
|
import org.jetbrains.kotlin.idea.caches.resolve.analyze
|
||||||
import org.jetbrains.kotlin.idea.intentions.isArrayOfMethod
|
import org.jetbrains.kotlin.idea.intentions.isArrayOfMethod
|
||||||
|
import org.jetbrains.kotlin.idea.refactoring.replaceWithCopyWithResolveCheck
|
||||||
import org.jetbrains.kotlin.psi.*
|
import org.jetbrains.kotlin.psi.*
|
||||||
import org.jetbrains.kotlin.psi.psiUtil.endOffset
|
import org.jetbrains.kotlin.psi.psiUtil.endOffset
|
||||||
import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
|
import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
|
||||||
import org.jetbrains.kotlin.psi.psiUtil.startOffset
|
import org.jetbrains.kotlin.psi.psiUtil.startOffset
|
||||||
|
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
|
||||||
|
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
|
||||||
|
|
||||||
class RemoveRedundantSpreadOperatorInspection : AbstractKotlinInspection() {
|
class RemoveRedundantSpreadOperatorInspection : AbstractKotlinInspection() {
|
||||||
override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor {
|
override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor {
|
||||||
@@ -31,6 +36,18 @@ class RemoveRedundantSpreadOperatorInspection : AbstractKotlinInspection() {
|
|||||||
when (argumentExpression) {
|
when (argumentExpression) {
|
||||||
is KtCallExpression -> {
|
is KtCallExpression -> {
|
||||||
if (!argumentExpression.isArrayOfMethod()) return
|
if (!argumentExpression.isArrayOfMethod()) return
|
||||||
|
if (argumentExpression.valueArguments.isEmpty()) {
|
||||||
|
val call = argument.getStrictParentOfType<KtCallExpression>()
|
||||||
|
if (call != null) {
|
||||||
|
val bindingContext = call.analyze(BodyResolveMode.PARTIAL)
|
||||||
|
if (call.replaceWithCopyWithResolveCheck(
|
||||||
|
resolveStrategy = { expr, context -> expr.getResolvedCall(context)?.resultingDescriptor },
|
||||||
|
context = bindingContext,
|
||||||
|
preHook = { valueArgumentList?.removeArgument(call.valueArguments.indexOfFirst { it == argument }) }
|
||||||
|
) == null
|
||||||
|
) return
|
||||||
|
}
|
||||||
|
}
|
||||||
argumentExpression.calleeExpression!!.endOffset - argumentOffset
|
argumentExpression.calleeExpression!!.endOffset - argumentOffset
|
||||||
}
|
}
|
||||||
is KtCollectionLiteralExpression -> startOffset + 1
|
is KtCollectionLiteralExpression -> startOffset + 1
|
||||||
|
|||||||
+5
@@ -0,0 +1,5 @@
|
|||||||
|
fun foo(vararg args: Int) {}
|
||||||
|
|
||||||
|
fun test() {
|
||||||
|
foo(<caret>*intArrayOf())
|
||||||
|
}
|
||||||
Vendored
+5
@@ -0,0 +1,5 @@
|
|||||||
|
fun foo(vararg args: Int) {}
|
||||||
|
|
||||||
|
fun test() {
|
||||||
|
foo()
|
||||||
|
}
|
||||||
Vendored
+8
@@ -0,0 +1,8 @@
|
|||||||
|
// PROBLEM: none
|
||||||
|
fun foo(vararg args: Int) {}
|
||||||
|
|
||||||
|
fun foo(vararg args: Double) {}
|
||||||
|
|
||||||
|
fun test() {
|
||||||
|
foo(<caret>*intArrayOf())
|
||||||
|
}
|
||||||
Vendored
+8
@@ -0,0 +1,8 @@
|
|||||||
|
// PROBLEM: none
|
||||||
|
fun foo(vararg args: Int) {}
|
||||||
|
|
||||||
|
fun foo() {}
|
||||||
|
|
||||||
|
fun test() {
|
||||||
|
foo(<caret>*intArrayOf())
|
||||||
|
}
|
||||||
+15
@@ -9727,6 +9727,21 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest {
|
|||||||
runTest("idea/testData/inspectionsLocal/removeRedundantSpreadOperator/intArrayOf.kt");
|
runTest("idea/testData/inspectionsLocal/removeRedundantSpreadOperator/intArrayOf.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("intArrayOfWithoutArguments.kt")
|
||||||
|
public void testIntArrayOfWithoutArguments() throws Exception {
|
||||||
|
runTest("idea/testData/inspectionsLocal/removeRedundantSpreadOperator/intArrayOfWithoutArguments.kt");
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("intArrayOfWithoutArguments2.kt")
|
||||||
|
public void testIntArrayOfWithoutArguments2() throws Exception {
|
||||||
|
runTest("idea/testData/inspectionsLocal/removeRedundantSpreadOperator/intArrayOfWithoutArguments2.kt");
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("intArrayOfWithoutArguments3.kt")
|
||||||
|
public void testIntArrayOfWithoutArguments3() throws Exception {
|
||||||
|
runTest("idea/testData/inspectionsLocal/removeRedundantSpreadOperator/intArrayOfWithoutArguments3.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("literal.kt")
|
@TestMetadata("literal.kt")
|
||||||
public void testLiteral() throws Exception {
|
public void testLiteral() throws Exception {
|
||||||
runTest("idea/testData/inspectionsLocal/removeRedundantSpreadOperator/literal.kt");
|
runTest("idea/testData/inspectionsLocal/removeRedundantSpreadOperator/literal.kt");
|
||||||
|
|||||||
Reference in New Issue
Block a user