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

#KT-6122 Fixed
2014-12-23 15:20:04 +03:00
parent 49b36cc942
commit 91220faf06
5 changed files with 48 additions and 3 deletions
@@ -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() }