From 62f957a4826af52ed18fb87b5e385a4983429b5d Mon Sep 17 00:00:00 2001 From: Sergej Jaskiewicz Date: Sun, 17 Jul 2022 17:43:10 +0200 Subject: [PATCH] [JS IR] Respect the `kotlinOptions.sourceMap = false` setting ^KT-52830 Fixed --- .../irToJs/IrModuleToJsTransformerTmp.kt | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformerTmp.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformerTmp.kt index 335e2def6b3..3e50e1940ee 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformerTmp.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformerTmp.kt @@ -433,20 +433,23 @@ fun generateSingleWrappedModuleBody( ) } -class SourceMapsInfo( +data class SourceMapsInfo( val sourceMapPrefix: String, val sourceRoots: List, val outputDir: File?, val sourceMapContentEmbedding: SourceMapSourceEmbedding, ) { companion object { - fun from(configuration: CompilerConfiguration) : SourceMapsInfo { - return SourceMapsInfo( - configuration.get(JSConfigurationKeys.SOURCE_MAP_PREFIX, ""), - configuration.get(JSConfigurationKeys.SOURCE_MAP_SOURCE_ROOTS, emptyList()), - configuration.get(JSConfigurationKeys.OUTPUT_DIR), - configuration.get(JSConfigurationKeys.SOURCE_MAP_EMBED_SOURCES, SourceMapSourceEmbedding.INLINING), - ) - } + fun from(configuration: CompilerConfiguration): SourceMapsInfo? = + if (configuration.getBoolean(JSConfigurationKeys.SOURCE_MAP)) { + SourceMapsInfo( + configuration.get(JSConfigurationKeys.SOURCE_MAP_PREFIX, ""), + configuration.get(JSConfigurationKeys.SOURCE_MAP_SOURCE_ROOTS, emptyList()), + configuration.get(JSConfigurationKeys.OUTPUT_DIR), + configuration.get(JSConfigurationKeys.SOURCE_MAP_EMBED_SOURCES, SourceMapSourceEmbedding.INLINING), + ) + } else { + null + } } }