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

Fix ArrayIndexOutOfBoundsException in named parameters completion

Browse Source
This commit is contained in:
Nikolay Krasko
2014-03-22 20:05:26 +04:00
parent de891ebc6e
commit b05fb38dcd
4 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java
+6 -4
View File
@@ -221,11 +221,13 @@ public class QuickFixUtil {
isPositionalArgument = false;
}
else if (isPositionalArgument) {
ValueParameterDescriptor parameter = callableDescriptor.getValueParameters().get(idx);
if (argument != ignoreArgument) {
usedParameters.add(parameter.getName().asString());
if (callableDescriptor.getValueParameters().size() > idx) {
ValueParameterDescriptor parameter = callableDescriptor.getValueParameters().get(idx);
if (argument != ignoreArgument) {
usedParameters.add(parameter.getName().asString());
}
idx++;
}
idx++;
}
}
idea/testData/completion/basic/common/namedParameters/ForEmptyParametersFunction.kt
+9
View File
@@ -0,0 +1,9 @@
fun test() {}
fun some() {
val localVal = 1
test(<caret>)
}
// Test no exceptions are thrown
// INVOCATION_COUNT: 1
// EXIST: localVal
idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java
+5
View File
@@ -498,6 +498,11 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
doTest("idea/testData/completion/basic/common/namedParameters/CompactTypeNames.kt");
}
@TestMetadata("ForEmptyParametersFunction.kt")
public void testForEmptyParametersFunction() throws Exception {
doTest("idea/testData/completion/basic/common/namedParameters/ForEmptyParametersFunction.kt");
}
@TestMetadata("InParameterExpression.kt")
public void testInParameterExpression() throws Exception {
doTest("idea/testData/completion/basic/common/namedParameters/InParameterExpression.kt");
idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java
+5
View File
@@ -498,6 +498,11 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
doTest("idea/testData/completion/basic/common/namedParameters/CompactTypeNames.kt");
}
@TestMetadata("ForEmptyParametersFunction.kt")
public void testForEmptyParametersFunction() throws Exception {
doTest("idea/testData/completion/basic/common/namedParameters/ForEmptyParametersFunction.kt");
}
@TestMetadata("InParameterExpression.kt")
public void testInParameterExpression() throws Exception {
doTest("idea/testData/completion/basic/common/namedParameters/InParameterExpression.kt");