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

JS: generate paths in source maps relative to .map file location

Browse Source 
See KT-19818
This commit is contained in:
Alexey Andreev
2017-08-29 14:28:15 +03:00
parent 93a3026c6d
commit 9008791a54
31 changed files with 236 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util/src/org/jetbrains/kotlin/utils/JsLibraryUtils.kt
+3 -3
View File
@@ -64,7 +64,7 @@ object JsLibraryUtils {
private fun File.runIfFileExists(relativePath: String, action: (JsLibrary) -> Unit) {
if (isFile) {
action(JsLibrary(readText(), relativePath, correspondingSourceMapFile().contentIfExists()))
action(JsLibrary(readText(), relativePath, correspondingSourceMapFile().contentIfExists(), this))
}
}
@@ -126,7 +126,7 @@ object JsLibraryUtils {
val stream = zipFile.getInputStream(entry)
val content = FileUtil.loadTextAndClose(stream)
librariesWithoutSourceMaps += JsLibrary(content, relativePath, null)
librariesWithoutSourceMaps += JsLibrary(content, relativePath, null, null)
}
else if (entryName.endsWith(KotlinJavascriptMetadataUtils.JS_MAP_EXT)) {
val correspondingJsPath = entryName.removeSuffix(KotlinJavascriptMetadataUtils.JS_MAP_EXT) +
@@ -171,4 +171,4 @@ object JsLibraryUtils {
}
}
data class JsLibrary(val content: String, val path: String, val sourceMapContent: String?)
data class JsLibrary(val content: String, val path: String, val sourceMapContent: String?, val file: File?)