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

Parameter name completion: suppressed auto-insertion

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-06-17 20:51:56 +03:00
parent 6478c7d460
commit 437478e694
4 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ParameterNameAndTypeCompletion.kt
+1 -1
View File
@@ -104,7 +104,7 @@ class ParameterNameAndTypeCompletion(
for (parameterName in parameterNames) { for (parameterName in parameterNames) {
if (prefixMatcher.prefixMatches(parameterName)) { if (prefixMatcher.prefixMatches(parameterName)) {
val nameAndType = nameAndTypeFactory(parameterName) val nameAndType = nameAndTypeFactory(parameterName)
collector.addElement(MyLookupElement(nameAndType, lookupElementFactory)) collector.addElement(MyLookupElement(nameAndType, lookupElementFactory).suppressAutoInsertion())
} }
} }
} }
idea/idea-completion/testData/basic/common/parameterNameAndType/NoAutoInsertion.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
class FooBar
fun f(fooBa<caret>)
// AUTOCOMPLETE_SETTING: true
// EXIST: fooBar
// NUMBER: 1
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java
+6
View File
@@ -1410,6 +1410,12 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/parameterNameAndType"), Pattern.compile("^(.+)\\.kt$"), true); JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/parameterNameAndType"), Pattern.compile("^(.+)\\.kt$"), true);
} }
@TestMetadata("NoAutoInsertion.kt")
public void testNoAutoInsertion() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NoAutoInsertion.kt");
doTest(fileName);
}
@TestMetadata("NoDuplication.kt") @TestMetadata("NoDuplication.kt")
public void testNoDuplication() throws Exception { public void testNoDuplication() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NoDuplication.kt"); String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NoDuplication.kt");
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java
+6
View File
@@ -1410,6 +1410,12 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/parameterNameAndType"), Pattern.compile("^(.+)\\.kt$"), true); JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/parameterNameAndType"), Pattern.compile("^(.+)\\.kt$"), true);
} }
@TestMetadata("NoAutoInsertion.kt")
public void testNoAutoInsertion() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NoAutoInsertion.kt");
doTest(fileName);
}
@TestMetadata("NoDuplication.kt") @TestMetadata("NoDuplication.kt")
public void testNoDuplication() throws Exception { public void testNoDuplication() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NoDuplication.kt"); String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NoDuplication.kt");