Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Unified Diff: pkg/compiler/lib/src/js_emitter/full_emitter/emitter.dart

Issue 2788373002: Add Source.getTextLine and use it to display source snippets in error messages. (Closed)
Patch Set: dartfmt Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/compiler/lib/src/js_emitter/full_emitter/emitter.dart
diff --git a/pkg/compiler/lib/src/js_emitter/full_emitter/emitter.dart b/pkg/compiler/lib/src/js_emitter/full_emitter/emitter.dart
index 0cb1a0697806269f3561d67f01180c982af746ea..be9c52b0610c2332e0daa08bec5a620e690198be 100644
--- a/pkg/compiler/lib/src/js_emitter/full_emitter/emitter.dart
+++ b/pkg/compiler/lib/src/js_emitter/full_emitter/emitter.dart
@@ -33,7 +33,7 @@ import '../../elements/elements.dart'
import '../../elements/entities.dart';
import '../../hash/sha1.dart' show Hasher;
import '../../io/code_output.dart';
-import '../../io/line_column_provider.dart' show LineColumnCollector;
+import '../../io/location_provider.dart' show LocationCollector;
import '../../io/source_map_builder.dart' show SourceMapBuilder;
import '../../js/js.dart' as jsAst;
import '../../js/js.dart' show js;
@@ -1523,11 +1523,11 @@ class Emitter implements js_emitter.Emitter {
}
void emitMainOutputUnit(OutputUnit mainOutputUnit, jsAst.Program program) {
- LineColumnCollector lineColumnCollector;
+ LocationCollector locationCollector;
List<CodeOutputListener> codeOutputListeners;
if (generateSourceMap) {
- lineColumnCollector = new LineColumnCollector();
- codeOutputListeners = <CodeOutputListener>[lineColumnCollector];
+ locationCollector = new LocationCollector();
+ codeOutputListeners = <CodeOutputListener>[locationCollector];
}
CodeOutput mainOutput = new StreamCodeOutput(
@@ -1551,7 +1551,7 @@ class Emitter implements js_emitter.Emitter {
if (generateSourceMap) {
SourceMapBuilder.outputSourceMap(
mainOutput,
- lineColumnCollector,
+ locationCollector,
'',
compiler.options.sourceMapUri,
compiler.options.outputUri,
@@ -1854,10 +1854,10 @@ class Emitter implements js_emitter.Emitter {
Hasher hasher = new Hasher();
outputListeners.add(hasher);
- LineColumnCollector lineColumnCollector;
+ LocationCollector locationCollector;
if (generateSourceMap) {
- lineColumnCollector = new LineColumnCollector();
- outputListeners.add(lineColumnCollector);
+ locationCollector = new LocationCollector();
+ outputListeners.add(locationCollector);
}
String partPrefix =
@@ -1904,7 +1904,7 @@ class Emitter implements js_emitter.Emitter {
output.add(SourceMapBuilder.generateSourceMapTag(mapUri, partUri));
output.close();
- SourceMapBuilder.outputSourceMap(output, lineColumnCollector, partName,
+ SourceMapBuilder.outputSourceMap(output, locationCollector, partName,
mapUri, partUri, compiler.outputProvider);
} else {
output.close();

Powered by Google App Engine
This is Rietveld 408576698