| Index: pkg/front_end/lib/src/fasta/translate_uri.dart
|
| diff --git a/pkg/front_end/lib/src/fasta/translate_uri.dart b/pkg/front_end/lib/src/fasta/translate_uri.dart
|
| index 44751ec6f85fdb959d7f6a8dedb1a1add4c6f526..bbbdaeb3d94b8f7ea7665a2ef27c7a65be35b2c4 100644
|
| --- a/pkg/front_end/lib/src/fasta/translate_uri.dart
|
| +++ b/pkg/front_end/lib/src/fasta/translate_uri.dart
|
| @@ -6,12 +6,11 @@ library fasta.translate_uri;
|
|
|
| import 'dart:async' show Future;
|
|
|
| +import 'package:front_end/file_system.dart';
|
| import 'package:package_config/packages_file.dart' as packages_file show parse;
|
|
|
| import 'errors.dart' show inputError;
|
|
|
| -import 'io.dart' show readBytesFromFile;
|
| -
|
| class TranslateUri {
|
| final Map<String, Uri> packages;
|
| final Map<String, Uri> dartLibraries;
|
| @@ -36,7 +35,8 @@ class TranslateUri {
|
| return root.resolve(path);
|
| }
|
|
|
| - static Future<TranslateUri> parse(Uri sdk, [Uri uri]) async {
|
| + static Future<TranslateUri> parse(FileSystem fileSystem, Uri sdk,
|
| + [Uri uri]) async {
|
| // This list below is generated with [bin/generate_dart_libraries.dart] and
|
| // additional entries for _builtin, _vmservice, profiler, and vmservice_io.
|
| //
|
| @@ -97,8 +97,7 @@ class TranslateUri {
|
| };
|
| }
|
| uri ??= Uri.base.resolve(".packages");
|
| - List<int> bytes =
|
| - await readBytesFromFile(uri, ensureZeroTermination: false);
|
| + List<int> bytes = await fileSystem.entityForUri(uri).readAsBytes();
|
| Map<String, Uri> packages = const <String, Uri>{};
|
| try {
|
| packages = packages_file.parse(bytes, uri);
|
|
|