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

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
+2
View File
@@ -1,5 +1,7 @@
$TESTDATA_DIR$/sourceMap.kt
-no-stdlib
-source-map
-source-map-prefix
./
-output
$TEMP_DIR$/out.js
+1 -1
View File
@@ -1,2 +1,2 @@
// EXISTS: out.js
// CONTAINS: out.js.map, "sourceMap.kt"
// CONTAINS: out.js.map, "./sourceMap.kt"
+2
View File
@@ -1,6 +1,8 @@
$TESTDATA_DIR$/sourceMap.kt
-no-stdlib
-source-map
-source-map-prefix
./
-source-map-embed-sources
always
-output
+1 -1
View File
@@ -1,3 +1,3 @@
// EXISTS: out.js
// CONTAINS: out.js.map, "sourceMap.kt"
// CONTAINS: out.js.map, "./sourceMap.kt"
// CONTAINS: out.js.map, "var log = \"\"\n\nfun foo(x: String) {
+14
View File
@@ -0,0 +1,14 @@
$TESTDATA_DIR$/sourceMapRelativeRoot/lib/src/lib.kt
-no-stdlib
-source-map
-meta-info
-output
$TESTDATA_DIR$/sourceMapRelativeRoot/lib/out/lib.js
---
$TESTDATA_DIR$/sourceMapRelativeRoot/main/src/main.kt
-no-stdlib
-libraries
$TESTDATA_DIR$/sourceMapRelativeRoot/lib/out/
-source-map
-output
$TESTDATA_DIR$/sourceMapRelativeRoot/main/out/main.js
+1
View File
@@ -0,0 +1 @@
OK
+5
View File
@@ -0,0 +1,5 @@
// EXISTS: $TESTDATA_DIR$/sourceMapRelativeRoot/lib/out/lib.js
// EXISTS: $TESTDATA_DIR$/sourceMapRelativeRoot/main/out/main.js
// CONTAINS: $TESTDATA_DIR$/sourceMapRelativeRoot/lib/out/lib.js.map, "../src/lib.kt"
// CONTAINS: $TESTDATA_DIR$/sourceMapRelativeRoot/main/out/main.js.map, "../src/main.kt"
// CONTAINS: $TESTDATA_DIR$/sourceMapRelativeRoot/main/out/main.js.map, "../../lib/src/lib.kt"
@@ -0,0 +1 @@
out
@@ -0,0 +1,4 @@
@Suppress("NOTHING_TO_INLINE")
inline fun foo() = 23
fun bar() = 42
@@ -0,0 +1 @@
fun box() = foo() + bar()
+2
View File
@@ -2,5 +2,7 @@ $TESTDATA_DIR$/sourceMapRoot/foo/file1.kt
$TESTDATA_DIR$/sourceMapRoot/bar/file2.kt
-no-stdlib
-source-map
-source-map-prefix
./
-output
$TEMP_DIR$/out.js
+2 -2
View File
@@ -1,3 +1,3 @@
// EXISTS: out.js
// CONTAINS: out.js.map, "foo/file1.kt"
// CONTAINS: out.js.map, "bar/file2.kt"
// CONTAINS: out.js.map, "./foo/file1.kt"
// CONTAINS: out.js.map, "./bar/file2.kt"