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

Remap source maps in JS DCE. Improve JS DCE error logging

Browse Source 
See KT-19821
This commit is contained in:
Alexey Andreev
2017-08-25 15:38:01 +03:00
parent 1350e3c4ac
commit c66bc0b0e9
28 changed files with 196 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-stdlib-js-merger/src/FileMerger.kt
+2 -2
View File
@@ -43,14 +43,14 @@ fun main(args: Array<String>) {
fun File.relativizeIfNecessary(): String = baseDir.relativize(canonicalFile.toPath()).toString()
val wrapperFile = File(args[2])
val wrapper = parse(wrapperFile.readText(), ThrowExceptionOnErrorReporter, program.scope, wrapperFile.relativizeIfNecessary())
val wrapper = parse(wrapperFile.readText(), ThrowExceptionOnErrorReporter, program.scope, wrapperFile.relativizeIfNecessary())!!
val insertionPlace = wrapper.createInsertionPlace()
val allFiles = mutableListOf<File>()
args.drop(3).map { File(it) }.forEach { collectFiles(it, allFiles) }
for (file in allFiles) {
val statements = parse(file.readText(), ThrowExceptionOnErrorReporter, program.scope, file.relativizeIfNecessary())
val statements = parse(file.readText(), ThrowExceptionOnErrorReporter, program.scope, file.relativizeIfNecessary())!!
val block = JsBlock(statements)
block.fixForwardNameReferences()