diff options
| author | Roman Golyshev <roman.golyshev@jetbrains.com> | 2020-09-15 15:16:07 +0300 |
|---|---|---|
| committer | kotlin-ide-monorepo-bot <kotlin-ide-monorepo-bot-no-reply@jetbrains.com> | 2020-11-27 22:02:34 +0000 |
| commit | 6f2261edcc923ffa87765bcbcfc7f4d1e41947ea (patch) | |
| tree | ffbb1897028f4ef8b9267bdca641368f5fde16e6 /analysis | |
| parent | da9b64f664567b31abdf4cdefdb06f7f62b9198d (diff) | |
| download | intellij-kotlin-6f2261edcc923ffa87765bcbcfc7f4d1e41947ea.tar.gz | |
KT-41859 Place classes after typealiases in `DeserializedMemberScope`
This way, the order in stubs and in deserialized text would be the same
On the next stub version bump, this fix should be reworked: the order
in the `DeserializedMemberScope` should be restored, and the order in
the stubs should be fixed to match the order in `MemberComparator`
^KT-41859 Fixed
(cherry picked from commit 945edfe98796f7a58a83e6e6b26a0e1d13def3dd)
Original commit: 6456d16675bec117f8a90ed4fc63a31cddf8ad69
GitOrigin-RevId: dd3523194d968344b5057431953fe75abd82c4b9
Diffstat (limited to 'analysis')
| -rw-r--r-- | analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt b/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt index 2ab4b72d4f74..a75d68a4ba68 100644 --- a/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt +++ b/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt @@ -219,6 +219,7 @@ private class ClassClsStubBuilder( } } + // FIXME using this function breaks the order of `MemberComparator` (see KT-41859) createDeclarationsStubs( classBody, c, thisAsProtoContainer, classProto.functionList, classProto.propertyList, classProto.typeAliasList ) |