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

Unified Diff: pkg/compiler/lib/src/apiimpl.dart

Issue 1165943005: Revert "Support Package Resolution Configuration files." (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 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
« no previous file with comments | « pkg/compiler/lib/compiler.dart ('k') | pkg/compiler/lib/src/dart2js.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/compiler/lib/src/apiimpl.dart
diff --git a/pkg/compiler/lib/src/apiimpl.dart b/pkg/compiler/lib/src/apiimpl.dart
index 4b560733c8be17a260a72113bec3d77c2814c3fb..a9579f042a4838721d55cd00a43f06c306460546 100644
--- a/pkg/compiler/lib/src/apiimpl.dart
+++ b/pkg/compiler/lib/src/apiimpl.dart
@@ -5,7 +5,6 @@
library leg_apiimpl;
import 'dart:async';
-import 'dart:convert';
import '../compiler.dart' as api;
import 'dart2jslib.dart' as leg;
@@ -14,10 +13,6 @@ import 'elements/elements.dart' as elements;
import 'package:_internal/libraries.dart' hide LIBRARIES;
import 'package:_internal/libraries.dart' as library_info show LIBRARIES;
import 'io/source_file.dart';
-import 'package:package_config/packages.dart';
-import 'package:package_config/packages_file.dart' as pkgs;
-import 'package:package_config/src/packages_impl.dart'
- show NonFilePackagesDirectoryPackages, MapPackages;
const bool forceIncrementalSupport =
const bool.fromEnvironment('DART2JS_EXPERIMENTAL_INCREMENTAL_SUPPORT');
@@ -26,10 +21,7 @@ class Compiler extends leg.Compiler {
api.CompilerInputProvider provider;
api.DiagnosticHandler handler;
final Uri libraryRoot;
- final Uri packageConfig;
final Uri packageRoot;
- final api.PackagesDiscoveryProvider packagesDiscoveryProvider;
- Packages packages;
List<String> options;
Map<String, dynamic> environment;
bool mockableLibraryUsed = false;
@@ -37,7 +29,6 @@ class Compiler extends leg.Compiler {
leg.GenericTask userHandlerTask;
leg.GenericTask userProviderTask;
- leg.GenericTask userPackagesDiscoveryTask;
Compiler(this.provider,
api.CompilerOutputProvider outputProvider,
@@ -45,9 +36,7 @@ class Compiler extends leg.Compiler {
this.libraryRoot,
this.packageRoot,
List<String> options,
- this.environment,
- [this.packageConfig,
- this.packagesDiscoveryProvider])
+ this.environment)
: this.options = options,
this.allowedLibraryCategories = getAllowedLibraryCategories(options),
super(
@@ -106,8 +95,6 @@ class Compiler extends leg.Compiler {
tasks.addAll([
userHandlerTask = new leg.GenericTask('Diagnostic handler', this),
userProviderTask = new leg.GenericTask('Input provider', this),
- userPackagesDiscoveryTask =
- new leg.GenericTask('Package discovery', this),
]);
if (libraryRoot == null) {
throw new ArgumentError("[libraryRoot] is null.");
@@ -115,11 +102,10 @@ class Compiler extends leg.Compiler {
if (!libraryRoot.path.endsWith("/")) {
throw new ArgumentError("[libraryRoot] must end with a /.");
}
- if (packageRoot != null && packageConfig != null) {
- throw new ArgumentError("Only one of [packageRoot] or [packageConfig] "
- "may be given.");
+ if (packageRoot == null) {
+ throw new ArgumentError("[packageRoot] is null.");
}
- if (packageRoot != null && !packageRoot.path.endsWith("/")) {
+ if (!packageRoot.path.endsWith("/")) {
throw new ArgumentError("[packageRoot] must end with a /.");
}
if (!analyzeOnly) {
@@ -173,7 +159,8 @@ class Compiler extends leg.Compiler {
// TODO(johnniwinther): Merge better with [translateDartUri] when
// [scanBuiltinLibrary] is removed.
- String lookupLibraryPath(LibraryInfo info) {
+ String lookupLibraryPath(String dartLibraryName) {
+ LibraryInfo info = lookupLibraryInfo(dartLibraryName);
if (info == null) return null;
if (!info.isDart2jsLibrary) return null;
if (!allowedLibraryCategories.contains(info.category)) return null;
@@ -297,7 +284,7 @@ class Compiler extends leg.Compiler {
Uri translateDartUri(elements.LibraryElement importingLibrary,
Uri resolvedUri, tree.Node node) {
LibraryInfo libraryInfo = lookupLibraryInfo(resolvedUri.path);
- String path = lookupLibraryPath(libraryInfo);
+ String path = lookupLibraryPath(resolvedUri.path);
if (libraryInfo != null &&
libraryInfo.category == "Internal") {
bool allowInternalLibraryAccess = false;
@@ -345,49 +332,25 @@ class Compiler extends leg.Compiler {
}
Uri translatePackageUri(leg.Spannable node, Uri uri) {
- return packages.resolve(uri);
- }
-
- Future setupPackages(Uri uri) async {
- if (packageRoot != null) {
- // Use "non-file" packages because the file version requires a [Directory]
- // and we can't depend on 'dart:io' classes.
- packages = new NonFilePackagesDirectoryPackages(packageRoot);
- } else if (packageConfig != null) {
- var packageConfigContents = await provider(packageConfig);
- if (packageConfigContents is String) {
- packageConfigContents = UTF8.encode(packageConfigContents);
- }
- packages =
- new MapPackages(pkgs.parse(packageConfigContents, packageConfig));
- } else {
- if (packagesDiscoveryProvider == null) {
- packages = Packages.noPackages;
- } else {
- packages = await callUserPackagesDiscovery(uri);
- }
- }
+ return packageRoot.resolve(uri.path);
}
- Future<bool> run(Uri uri) async {
+ Future<bool> run(Uri uri) {
log('Allowed library categories: $allowedLibraryCategories');
-
- await setupPackages(uri);
- assert(packages != null);
-
- bool success = await super.run(uri);
- int cumulated = 0;
- for (final task in tasks) {
- int elapsed = task.timing;
- if (elapsed != 0) {
- cumulated += elapsed;
- log('${task.name} took ${elapsed}msec');
+ return super.run(uri).then((bool success) {
+ int cumulated = 0;
+ for (final task in tasks) {
+ int elapsed = task.timing;
+ if (elapsed != 0) {
+ cumulated += elapsed;
+ log('${task.name} took ${elapsed}msec');
+ }
}
- }
- int total = totalCompileTime.elapsedMilliseconds;
- log('Total compile-time ${total}msec;'
- ' unaccounted ${total - cumulated}msec');
- return success;
+ int total = totalCompileTime.elapsedMilliseconds;
+ log('Total compile-time ${total}msec;'
+ ' unaccounted ${total - cumulated}msec');
+ return success;
+ });
}
void reportDiagnostic(leg.Spannable node,
@@ -436,16 +399,6 @@ class Compiler extends leg.Compiler {
}
}
- Future<Packages> callUserPackagesDiscovery(Uri uri) {
- try {
- return userPackagesDiscoveryTask.measure(
- () => packagesDiscoveryProvider(uri));
- } catch (ex, s) {
- diagnoseCrashInUserCode('Uncaught exception in package discovery', ex, s);
- rethrow;
- }
- }
-
void diagnoseCrashInUserCode(String message, exception, stackTrace) {
hasCrashed = true;
print('$message: ${tryToString(exception)}');
« no previous file with comments | « pkg/compiler/lib/compiler.dart ('k') | pkg/compiler/lib/src/dart2js.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698