azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[JS] Convert SourceFilePathResolver to Kotlin, fix usages

Browse Source
This commit is contained in:
Sergej Jaskiewicz
2022-05-24 01:29:47 +03:00
committed by Space
parent 4bf79cd23b
commit 0614c519af
3 changed files with 51 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt
+2 -6
View File
@@ -208,11 +208,7 @@ class IrModuleToJsTransformer(
val sourceMapBuilder = SourceMap3Builder(null, jsCode, sourceMapPrefix)
val sourceMapBuilderConsumer =
if (sourceMapsEnabled) {
val sourceRoots = configuration.get(JSConfigurationKeys.SOURCE_MAP_SOURCE_ROOTS, emptyList<String>()).map(::File)
val generateRelativePathsInSourceMap = sourceMapPrefix.isEmpty() && sourceRoots.isEmpty()
val outputDir = if (generateRelativePathsInSourceMap) configuration.get(JSConfigurationKeys.OUTPUT_DIR) else null
val pathResolver = SourceFilePathResolver(sourceRoots, outputDir)
val pathResolver = SourceFilePathResolver.create(configuration)
val sourceMapContentEmbedding =
configuration.get(JSConfigurationKeys.SOURCE_MAP_EMBED_SOURCES, SourceMapSourceEmbedding.INLINING)
@@ -503,4 +499,4 @@ fun processClassModels(
{ klass -> classModelMap[klass]?.superClasses ?: emptyList() },
declarationHandler
)
}
}
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformerTmp.kt
+1 -5
View File
@@ -410,11 +410,7 @@ fun generateSingleWrappedModuleBody(
val sourceMapPrefix = sourceMapsInfo.sourceMapPrefix
sourceMapBuilder = SourceMap3Builder(null, jsCode, sourceMapPrefix)
val sourceRoots = sourceMapsInfo.sourceRoots.map(::File)
val generateRelativePathsInSourceMap = sourceMapPrefix.isEmpty() && sourceRoots.isEmpty()
val outputDir = if (generateRelativePathsInSourceMap) sourceMapsInfo.outputDir else null
val pathResolver = SourceFilePathResolver(sourceRoots, outputDir)
val pathResolver = SourceFilePathResolver.create(sourceMapsInfo.sourceRoots, sourceMapPrefix, sourceMapsInfo.outputDir)
val sourceMapContentEmbedding =
sourceMapsInfo.sourceMapContentEmbedding