Don't resort deserialized descriptors based on renderer, preserve proto order

Use only names and types for sorting. Otherwise if deserialized descriptor
is rendered different from origin we might get Psi-Stub mismatch error.

Use the original proto order for declarations with same name and kind.

 #KT-20782 Fixed
 #EA-109887 Fixed
This commit is contained in:
Nikolay Krasko
2017-10-26 16:33:10 +03:00
parent 1408c4bd44
commit 2d7fe98e55
2 changed files with 61 additions and 35 deletions
@@ -207,7 +207,7 @@ abstract class DeserializedMemberScope protected constructor(
}
}
subResult.sortWith(MemberComparator.INSTANCE)
subResult.sortWith(MemberComparator.NameAndTypeMemberComparator.INSTANCE)
result.addAll(subResult)
}