From 5e81850bb12dd095dd8d94b5c9ded043e81caf7a Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Thu, 22 Feb 2024 18:00:49 +0100 Subject: [PATCH] [KLIB tool] Don't sort declarations in "dump-metadata" command Instead, let the command print declarations in the program order. Do sorting only in special "test mode". ^KT-62340 --- .../kotlin/cli/klib/KotlinpBasedMetadataDumper.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KotlinpBasedMetadataDumper.kt b/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KotlinpBasedMetadataDumper.kt index 0c85dd1e025..b17cfce92b4 100644 --- a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KotlinpBasedMetadataDumper.kt +++ b/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KotlinpBasedMetadataDumper.kt @@ -47,7 +47,10 @@ internal class KotlinpBasedMetadataDumper( val signatureComputer = prepareSignatureComputer(library, moduleMetadata) - KlibKotlinp(DEFAULT_SETTINGS, signatureComputer).renderModule(moduleMetadata, printer) + KlibKotlinp( + Settings(isVerbose = true, sortDeclarations = testMode), + signatureComputer + ).renderModule(moduleMetadata, printer) } private fun preprocessMetadataForTests(originalModuleMetadata: KlibModuleMetadata) = KlibModuleMetadata( @@ -108,7 +111,7 @@ internal class KotlinpBasedMetadataDumper( private fun KmProperty.sortingKey() = propertyId("") companion object { - private val DEFAULT_SETTINGS = Settings(isVerbose = true, sortDeclarations = true) + private val DEFAULT_SETTINGS = Settings(isVerbose = true, sortDeclarations = false) } }