From 3b2986f069976d03b91a88598012a85ebc7d0149 Mon Sep 17 00:00:00 2001 From: Ivan Gavrilovic Date: Mon, 11 Jan 2021 12:27:04 +0000 Subject: [PATCH] Apply consistent sorting for elements from the same position There could be multiple elements originating from the same position in the source file, so make sure to use name+desc to sort those. --- .../kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt index 1fce23ea910..bd6b5b6ef8e 100644 --- a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt +++ b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt @@ -462,7 +462,9 @@ class ClassFileToSourceStubConverter(val kaptContext: KaptContextForStubGenerati return if (position1 != null && position1.path == classSource.path) { if (position2 != null && position2.path == classSource.path) { - position1.pos.compareTo(position2.pos) + val positionCompare = position1.pos.compareTo(position2.pos) + if (positionCompare != 0) positionCompare + else compareDescriptors(data1, data2) } else { -1 }