diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt index bc6b2d7bfa0..817b47f0e17 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt @@ -58,8 +58,8 @@ class MultipleArgumentsItemProvider( val added = HashSet() for (expectedInfo in expectedInfos) { val additionalData = expectedInfo.additionalData - if (additionalData is ArgumentPositionData.Positional && additionalData.argumentIndex == 0) { - val parameters = additionalData.function.valueParameters + if (additionalData is ArgumentPositionData.Positional) { + val parameters = additionalData.function.valueParameters.drop(additionalData.argumentIndex) if (parameters.size > 1) { val tail = when (additionalData.callType) { Call.CallType.ARRAY_GET_METHOD, Call.CallType.ARRAY_SET_METHOD -> Tail.RBRACKET diff --git a/idea/idea-completion/testData/smart/multipleArgsItem/notFirstArgument.kt b/idea/idea-completion/testData/smart/multipleArgsItem/notFirstArgument.kt new file mode 100644 index 00000000000..0749e6c3c37 --- /dev/null +++ b/idea/idea-completion/testData/smart/multipleArgsItem/notFirstArgument.kt @@ -0,0 +1,10 @@ +fun f(a: Long, b: Int, c: String) {} + +fun foo() { + val a = 0L + val b = 0 + val c = "0" + f(a, ) +} + +// EXIST: "b, c" \ No newline at end of file diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmSmartCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmSmartCompletionTestGenerated.java index a2e26e389e4..51d65c2784a 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmSmartCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmSmartCompletionTestGenerated.java @@ -1588,6 +1588,12 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/CallWithBrackets.kt"); doTest(fileName); } + + @TestMetadata("notFirstArgument.kt") + public void testNotFirstArgument() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/notFirstArgument.kt"); + doTest(fileName); + } } @TestMetadata("idea/idea-completion/testData/smart/propertyDelegate")