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

Unified Diff: pkg/front_end/lib/src/base/processed_options.dart

Issue 2964323002: Add support for multi-roots (Closed)
Patch Set: Created 3 years, 6 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/front_end/lib/src/base/processed_options.dart
diff --git a/pkg/front_end/lib/src/base/processed_options.dart b/pkg/front_end/lib/src/base/processed_options.dart
index e26c4b4a315614d0b748fb6893e48e6749996644..c79d1a7ec370ea06520066e9238abaf25cb16792 100644
--- a/pkg/front_end/lib/src/base/processed_options.dart
+++ b/pkg/front_end/lib/src/base/processed_options.dart
@@ -8,11 +8,12 @@ import 'package:kernel/target/targets.dart';
import 'package:kernel/target/vm_fasta.dart';
import 'package:front_end/compiler_options.dart';
import 'package:front_end/file_system.dart';
-import 'package:front_end/src/fasta/translate_uri.dart';
-import 'package:front_end/src/fasta/ticker.dart';
-import 'package:front_end/src/fasta/errors.dart';
import 'package:front_end/src/base/performace_logger.dart';
+import 'package:front_end/src/fasta/errors.dart';
+import 'package:front_end/src/fasta/ticker.dart';
+import 'package:front_end/src/fasta/translate_uri.dart';
import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/multi_root_file_system.dart';
import 'package:front_end/src/simple_error.dart';
import 'package:package_config/packages_file.dart' as package_config;
import 'package:kernel/kernel.dart'
@@ -278,10 +279,16 @@ class ProcessedOptions {
/// Create a [FileSystem] specific to the current options.
///
- /// If [chaseDependencies] is false, the resulting file system will be
- /// hermetic.
+ /// If `_raw.multiRoots` is not empty, the file-system will implement the
+ /// semantics of multiple roots. If [chaseDependencies] is false, the
+ /// resulting file system will be hermetic.
FileSystem _createFileSystem() {
var result = _raw.fileSystem;
+ // Note: hermetic checks are done before translating multi-root URIs, so
+ // the order in which we create the file systems below is relevant.
+ if (!_raw.multiRoots.isEmpty) {
+ result = new MultiRootFileSystem('multi-root', _raw.multiRoots, result);
+ }
if (!chaseDependencies) {
var allInputs = inputs.toSet();
allInputs.addAll(_raw.inputSummaries);
@@ -301,8 +308,6 @@ class ProcessedOptions {
if (_raw.packagesFileUri != null) allInputs.add(_raw.packagesFileUri);
result = new HermeticFileSystem(allInputs, result);
}
- // TODO(paulberry): support multiRoots.
- assert(_raw.multiRoots.isEmpty);
return result;
}
}

Powered by Google App Engine
This is Rietveld 408576698