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

KT-6122 Code completion in when in enum extension methods suggests non-qualified enum entry names

Browse Source 
#KT-6122 Fixed
This commit is contained in:
Valentin Kipyatkov
2014-12-23 15:20:04 +03:00
parent 49b36cc942
commit 91220faf06
5 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/jet/plugin/codeInsight/ReferenceVariantsHelper.kt
+2 -3
View File
@@ -113,9 +113,8 @@ public class ReferenceVariantsHelper(
// process instance members that can be called via implicit receiver's instances
val receivers = resolutionScope.getImplicitReceiversWithInstance()
receivers.flatMapTo(descriptorsSet) {
it.getType().getMemberScope().getDescriptorsFiltered(kindFilter exclude DescriptorKindExclude.Extensions, nameFilter)
}
val fromReceiversFilter = kindFilter.withoutKinds(DescriptorKindFilter.CLASSIFIERS_MASK) exclude DescriptorKindExclude.Extensions
receivers.flatMapTo(descriptorsSet) { it.getType().getMemberScope().getDescriptorsFiltered(fromReceiversFilter, nameFilter) }
val dataFlowInfo = context.getDataFlowInfo(expression)
val receiverValues = receivers.map { it.getValue() }
idea/testData/completion/basic/common/NoEnumMembersFromImplicitQualifier.kt
+11
View File
@@ -0,0 +1,11 @@
enum class E {
A
B
}
fun E.foo() {
<caret>
}
// ABSENT: A
// ABSENT: B
idea/testData/completion/basic/common/NoNestedClassesFromImplicitQualifier.kt
+11
View File
@@ -0,0 +1,11 @@
class Outer {
class Nested
inner class Inner
}
fun Outer.foo() {
<caret>
}
// ABSENT: Nested
// ABSENT: Inner
idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java
+12
View File
@@ -706,6 +706,12 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
doTest(fileName);
}
@TestMetadata("NoEnumMembersFromImplicitQualifier.kt")
public void testNoEnumMembersFromImplicitQualifier() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoEnumMembersFromImplicitQualifier.kt");
doTest(fileName);
}
@TestMetadata("NoExtensionsAfterQualifier.kt")
public void testNoExtensionsAfterQualifier() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoExtensionsAfterQualifier.kt");
@@ -718,6 +724,12 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
doTest(fileName);
}
@TestMetadata("NoNestedClassesFromImplicitQualifier.kt")
public void testNoNestedClassesFromImplicitQualifier() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoNestedClassesFromImplicitQualifier.kt");
doTest(fileName);
}
@TestMetadata("NoPackageFacadeClasses.kt")
public void testNoPackageFacadeClasses() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoPackageFacadeClasses.kt");
idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java
+12
View File
@@ -706,6 +706,12 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
doTest(fileName);
}
@TestMetadata("NoEnumMembersFromImplicitQualifier.kt")
public void testNoEnumMembersFromImplicitQualifier() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoEnumMembersFromImplicitQualifier.kt");
doTest(fileName);
}
@TestMetadata("NoExtensionsAfterQualifier.kt")
public void testNoExtensionsAfterQualifier() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoExtensionsAfterQualifier.kt");
@@ -718,6 +724,12 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
doTest(fileName);
}
@TestMetadata("NoNestedClassesFromImplicitQualifier.kt")
public void testNoNestedClassesFromImplicitQualifier() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoNestedClassesFromImplicitQualifier.kt");
doTest(fileName);
}
@TestMetadata("NoPackageFacadeClasses.kt")
public void testNoPackageFacadeClasses() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoPackageFacadeClasses.kt");