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

JS backend: sourcemap should use absolute file urls.

Browse Source 
#KT-927 in progress

(cherry picked from commit 8931d26)
This commit is contained in:
develar
2013-08-23 22:12:37 +04:00
committed by Zalim Bashorov
parent 3ab095a4f5
commit e05ffd03c3
4 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/lib/dart-ast.jar
BIN
View File
Binary file not shown.
js/js.translator/lib/src/dart-ast-src.jar
BIN
View File
Binary file not shown.
js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java
+2 -2
View File
@@ -54,11 +54,11 @@ public final class K2JSTranslator {
K2JSTranslator translator = new K2JSTranslator(config); K2JSTranslator translator = new K2JSTranslator(config);
File outFile = new File(outputPath); File outFile = new File(outputPath);
TextOutputImpl output = new TextOutputImpl(); TextOutputImpl output = new TextOutputImpl();
SourceMapBuilder sourceMapBuilder = config.isSourcemap() ? new SourceMapBuilder(outFile.getName(), output, new SourceMapBuilderConsumer()) : null; SourceMapBuilder sourceMapBuilder = config.isSourcemap() ? new SourceMapBuilder(outFile, output, new SourceMapBuilderConsumer()) : null;
String programCode = translator.generateProgramCode(files, mainCall, output, sourceMapBuilder); String programCode = translator.generateProgramCode(files, mainCall, output, sourceMapBuilder);
FileUtil.writeToFile(outFile, programCode); FileUtil.writeToFile(outFile, programCode);
if (sourceMapBuilder != null) { if (sourceMapBuilder != null) {
FileUtil.writeToFile(new File(outFile.getParentFile(), sourceMapBuilder.getOutFilename()), sourceMapBuilder.build()); FileUtil.writeToFile(sourceMapBuilder.getOutFile(), sourceMapBuilder.build());
} }
} }
js/js.translator/src/org/jetbrains/k2js/facade/SourceMapBuilderConsumer.java
+1 -1
View File
@@ -36,6 +36,6 @@ class SourceMapBuilderConsumer implements PairConsumer<SourceMapBuilder, Object>
assert document != null; assert document != null;
int line = document.getLineNumber(offset); int line = document.getLineNumber(offset);
int column = offset - document.getLineStartOffset(line); int column = offset - document.getLineStartOffset(line);
builder.addMapping(file.getViewProvider().getVirtualFile().getPath(), line, column); builder.addMapping(file.getViewProvider().getVirtualFile().getUrl(), line, column);
} }
} }