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

Fixed KT-5809 Code completion after "?." should not include keywords

Browse Source 
#KT-5809 Fixed
This commit is contained in:
Valentin Kipyatkov
2014-10-09 19:18:59 +02:00
parent 549171d043
commit 50e1ec9c4f
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/KeywordCompletion.kt
+2 -1
View File
@@ -67,7 +67,8 @@ object KeywordCompletion {
CommentFilter(), CommentFilter(),
ParentFilter(ClassFilter(javaClass<JetLiteralStringTemplateEntry>())), ParentFilter(ClassFilter(javaClass<JetLiteralStringTemplateEntry>())),
ParentFilter(ClassFilter(javaClass<JetConstantExpression>())), ParentFilter(ClassFilter(javaClass<JetConstantExpression>())),
LeftNeighbour(TextFilter(".")) LeftNeighbour(TextFilter(".")),
LeftNeighbour(TextFilter("?."))
)) ))
private class CommentFilter() : ElementFilter { private class CommentFilter() : ElementFilter {
idea/testData/completion/keywords/AfterSafeDot.kt
+6
View File
@@ -0,0 +1,6 @@
fun foo() {
val str : String?
str?.<caret>
}
// NUMBER: 0
idea/tests/org/jetbrains/jet/completion/KeywordCompletionTestGenerated.java
+7 -5
View File
@@ -17,13 +17,9 @@
package org.jetbrains.jet.completion; package org.jetbrains.jet.completion;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.junit.runner.RunWith;
import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.test.InnerTestClasses;
import org.jetbrains.jet.test.TestMetadata; import org.jetbrains.jet.test.TestMetadata;
import org.jetbrains.jet.JUnit3RunnerWithInners; import org.junit.runner.RunWith;
import java.io.File; import java.io.File;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@@ -52,6 +48,12 @@ public class KeywordCompletionTestGenerated extends AbstractKeywordCompletionTes
doTest(fileName); doTest(fileName);
} }
@TestMetadata("AfterSafeDot.kt")
public void testAfterSafeDot() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/AfterSafeDot.kt");
doTest(fileName);
}
@TestMetadata("AfterSpaceAndDot.kt") @TestMetadata("AfterSpaceAndDot.kt")
public void testAfterSpaceAndDot() throws Exception { public void testAfterSpaceAndDot() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/AfterSpaceAndDot.kt"); String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/AfterSpaceAndDot.kt");