[Fasta] include source code in dill

pkg/front_end/lib/src/fasta/source/source_loader.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library fasta.source_loader;
 
 import 'dart:async' show Future;
 
 import 'dart:io' show FileSystemException;
 
@@ skipping 22 matching lines @@
 import '../loader.dart' show Loader;
 
 import '../target_implementation.dart' show TargetImplementation;
 
 import 'diet_listener.dart' show DietListener;
 
 import 'diet_parser.dart' show DietParser;
 
 import 'source_library_builder.dart' show SourceLibraryBuilder;
 
+import '../compiler_context.dart' show CompilerContext;
+
 class SourceLoader<L> extends Loader<L> {
   final Map<Uri, List<int>> sourceBytes = <Uri, List<int>>{};
+  bool get includeSource => CompilerContext.current.options.includeSource;

[ahe, 2017/03/03 13:14:50]

This should be set when constructing this object:

final includeSource = CompilerContext.current.options.includeSource;

Looking up options may be rather slow.

[jensj, 2017/03/06 07:38:36]

Done.

 
   // Used when building directly to kernel.
   ClassHierarchy hierarchy;
   CoreTypes coreTypes;
 
   SourceLoader(TargetImplementation target) : super(target);
 
   Future<Token> tokenize(SourceLibraryBuilder library,
       {bool suppressLexicalErrors: false}) async {
     Uri uri = library.fileUri;
     if (uri == null || uri.scheme != "file") {
       return inputError(library.uri, -1, "Not found: ${library.uri}.");
     }
     try {
       List<int> bytes = sourceBytes[uri];
       if (bytes == null) {
         bytes = sourceBytes[uri] = await readBytesFromFile(uri);
       }
       byteCount += bytes.length - 1;
       ScannerResult result = scan(bytes);
       Token token = result.tokens;
       if (!suppressLexicalErrors) {
-        target.addLineStarts(library.fileUri, result.lineStarts);
+        var source = includeSource ? bytes : const <int>[];

[ahe, 2017/03/03 13:14:50]

var -> List<int>

[jensj, 2017/03/06 07:38:36]

Done.

+        target.addSourceInformation(library.fileUri, result.lineStarts, source);
       }
       while (token is ErrorToken) {
         if (!suppressLexicalErrors) {
           ErrorToken error = token;
           printUnexpected(uri, token.charOffset, error.assertionMessage);
         }
         token = token.next;
       }
       return token;
     } on FileSystemException catch (e) {
@@ skipping 259 matching lines @@
 
   void computeHierarchy(Program program) {
     hierarchy = new ClassHierarchy(program);
     ticker.logMs("Computed class hierarchy");
     coreTypes = new CoreTypes(program);
     ticker.logMs("Computed core types");
   }
 
   List<Uri> getDependencies() => sourceBytes.keys.toList();
 }