| Index: pkg/dev_compiler/web/web_command.dart
|
| diff --git a/pkg/dev_compiler/web/web_command.dart b/pkg/dev_compiler/web/web_command.dart
|
| index 641c37dd43c3c869ade7cc0946ab2da146abbbe4..1df3255ec61bf74ce53e0bccdf0b22b16f40c8b0 100644
|
| --- a/pkg/dev_compiler/web/web_command.dart
|
| +++ b/pkg/dev_compiler/web/web_command.dart
|
| @@ -20,10 +20,7 @@ import 'package:analyzer/file_system/memory_file_system.dart'
|
| import 'package:analyzer/src/context/context.dart' show AnalysisContextImpl;
|
| import 'package:analyzer/src/summary/idl.dart' show PackageBundle;
|
| import 'package:analyzer/src/summary/package_bundle_reader.dart'
|
| - show
|
| - SummaryDataStore,
|
| - InSummaryUriResolver,
|
| - InSummarySource;
|
| + show SummaryDataStore, InSummaryUriResolver, InSummarySource;
|
| import 'package:analyzer/src/dart/resolver/scope.dart' show Scope;
|
|
|
| import 'package:args/command_runner.dart';
|
| @@ -66,8 +63,8 @@ class WebCompileCommand extends Command {
|
| return requestSummaries;
|
| }
|
|
|
| - void requestSummaries(String summaryRoot, String sdkUrl, List<String> summaryUrls,
|
| - Function onCompileReady, Function onError) {
|
| + void requestSummaries(String summaryRoot, String sdkUrl,
|
| + List<String> summaryUrls, Function onCompileReady, Function onError) {
|
| HttpRequest
|
| .request(sdkUrl,
|
| responseType: "arraybuffer", mimeType: "application/octet-stream")
|
| @@ -89,8 +86,8 @@ class WebCompileCommand extends Command {
|
|
|
| onCompileReady(setUpCompile(sdkBytes, summaryBytes, summaryUrls));
|
| }).catchError((error) => onError('Summaries failed to load: $error'));
|
| - }).catchError(
|
| - (error) => onError('Dart sdk summaries failed to load: $error. url: $sdkUrl'));
|
| + }).catchError((error) =>
|
| + onError('Dart sdk summaries failed to load: $error. url: $sdkUrl'));
|
| }
|
|
|
| List<Function> setUpCompile(List<int> sdkBytes, List<List<int>> summaryBytes,
|
| @@ -103,10 +100,10 @@ class WebCompileCommand extends Command {
|
| var resourceUriResolver = new ResourceUriResolver(resourceProvider);
|
|
|
| var options = new AnalyzerOptions.basic(
|
| - dartSdkPath: '/dart-sdk', dartSdkSummaryPath: dartSdkSummaryPath);
|
| + dartSdkPath: '/dart-sdk', dartSdkSummaryPath: dartSdkSummaryPath);
|
|
|
| - var summaryDataStore =
|
| - new SummaryDataStore(options.summaryPaths, resourceProvider: resourceProvider, recordDependencyInfo: true);
|
| + var summaryDataStore = new SummaryDataStore(options.summaryPaths,
|
| + resourceProvider: resourceProvider, recordDependencyInfo: true);
|
| for (var i = 0; i < summaryBytes.length; i++) {
|
| var bytes = summaryBytes[i];
|
| var url = '/' + summaryUrls[i];
|
| @@ -118,8 +115,7 @@ class WebCompileCommand extends Command {
|
|
|
| var fileResolvers = [summaryResolver, resourceUriResolver];
|
|
|
| - var compiler = new ModuleCompiler(
|
| - options,
|
| + var compiler = new ModuleCompiler(options,
|
| analysisRoot: '/web-compile-root',
|
| fileResolvers: fileResolvers,
|
| resourceProvider: resourceProvider,
|
|
|