Extension/non-Extension members are deserialized in correct order

2014-11-11 16:44:42 +03:00
parent 8e1111d690
commit 8016766b23
6 changed files with 116 additions and 7 deletions
@@ -110,13 +110,7 @@ public abstract class DeserializedMemberScope protected(
            addEnumEntryDescriptors(result, nameFilter)
        }

-        val names = membersProtos().keySet().filter(nameFilter)
-        if (kindFilter.acceptsKinds(DescriptorKindFilter.VARIABLES_MASK)) {
-            names.forEach { result.addAll(getProperties(it)) }
-        }
-        if (kindFilter.acceptsKinds(DescriptorKindFilter.FUNCTIONS_MASK)) {
-            names.forEach { result.addAll(getFunctions(it)) }
-        }
+        addFunctionsAndProperties(result, kindFilter, nameFilter)

        addNonDeclaredDescriptors(result)

@@ -127,6 +121,40 @@ public abstract class DeserializedMemberScope protected(
        return result.toReadOnlyList()
    }

+    private fun addFunctionsAndProperties(
+            result: LinkedHashSet<DeclarationDescriptor>,
+            kindFilter: DescriptorKindFilter,
+            nameFilter: (Name) -> Boolean
+    ) {
+        val names = membersProtos().keySet().filter(nameFilter)
+        if (kindFilter.acceptsKinds(DescriptorKindFilter.VARIABLES_MASK)) {
+            addMembers(names, result) { getProperties(it) }
+        }
+        if (kindFilter.acceptsKinds(DescriptorKindFilter.FUNCTIONS_MASK)) {
+            addMembers(names, result) { getFunctions(it) }
+        }
+    }
+
+    private fun addMembers(
+            names: List<Name>,
+            result: MutableCollection<DeclarationDescriptor>,
+            getMembers: (Name) -> Collection<CallableDescriptor>) {
+        val extensions = ArrayList<DeclarationDescriptor>()
+        val nonExtensions = ArrayList<DeclarationDescriptor>()
+        names.forEach { name ->
+            getMembers(name).forEach { member ->
+                if (member.getExtensionReceiverParameter() == null) {
+                    nonExtensions.add(member)
+                }
+                else {
+                    extensions.add(member)
+                }
+            }
+        }
+        result.addAll(nonExtensions)
+        result.addAll(extensions)
+    }
+
    protected abstract fun addNonDeclaredDescriptors(result: MutableCollection<DeclarationDescriptor>)

    protected abstract fun addEnumEntryDescriptors(result: MutableCollection<DeclarationDescriptor>, nameFilter: (Name) -> Boolean)