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

KT-10619 Wrong completion after package name in annotation

Browse Source 
#KT-10619 Fixed
This commit is contained in:
Valentin Kipyatkov
2016-02-11 18:49:15 +03:00
parent 17ac168b33
commit 0809be59df
4 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt
+13 -11
View File
@@ -272,18 +272,20 @@ class BasicCompletionSession(
} }
} }
val classKindFilter: ((ClassKind) -> Boolean)? if (callTypeAndReceiver.receiver == null) {
when (callTypeAndReceiver) { val classKindFilter: ((ClassKind) -> Boolean)?
is CallTypeAndReceiver.ANNOTATION -> classKindFilter = { it == ClassKind.ANNOTATION_CLASS } when (callTypeAndReceiver) {
is CallTypeAndReceiver.DEFAULT, is CallTypeAndReceiver.TYPE -> classKindFilter = { it != ClassKind.ENUM_ENTRY } is CallTypeAndReceiver.ANNOTATION -> classKindFilter = { it == ClassKind.ANNOTATION_CLASS }
else -> classKindFilter = null is CallTypeAndReceiver.DEFAULT, is CallTypeAndReceiver.TYPE -> classKindFilter = { it != ClassKind.ENUM_ENTRY }
} else -> classKindFilter = null
if (classKindFilter != null) {
if (configuration.completeNonImportedClasses) {
addClassesFromIndex(classKindFilter)
} }
else { if (classKindFilter != null) {
collector.advertiseSecondCompletion() if (configuration.completeNonImportedClasses) {
addClassesFromIndex(classKindFilter)
}
else {
collector.advertiseSecondCompletion()
}
} }
} }
} }
idea/idea-completion/testData/basic/common/annotations/AfterPackageName.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
@kotlin.concurrent.<caret>
// INVOCATION_COUNT: 2
// ABSENT: Deprecated
// ABSENT: Volatile
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java
+6
View File
@@ -791,6 +791,12 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Annotations extends AbstractJSBasicCompletionTest { public static class Annotations extends AbstractJSBasicCompletionTest {
@TestMetadata("AfterPackageName.kt")
public void testAfterPackageName() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/AfterPackageName.kt");
doTest(fileName);
}
public void testAllFilesPresentInAnnotations() throws Exception { public void testAllFilesPresentInAnnotations() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/annotations"), Pattern.compile("^(.+)\\.kt$"), true); KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/annotations"), Pattern.compile("^(.+)\\.kt$"), true);
} }
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java
+6
View File
@@ -791,6 +791,12 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Annotations extends AbstractJvmBasicCompletionTest { public static class Annotations extends AbstractJvmBasicCompletionTest {
@TestMetadata("AfterPackageName.kt")
public void testAfterPackageName() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/AfterPackageName.kt");
doTest(fileName);
}
public void testAllFilesPresentInAnnotations() throws Exception { public void testAllFilesPresentInAnnotations() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/annotations"), Pattern.compile("^(.+)\\.kt$"), true); KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/annotations"), Pattern.compile("^(.+)\\.kt$"), true);
} }