| Index: third_party/pkg/angular/lib/tools/expression_extractor.dart
|
| diff --git a/third_party/pkg/angular/lib/tools/expression_extractor.dart b/third_party/pkg/angular/lib/tools/expression_extractor.dart
|
| index ae42c07f90316fc9d230fe21634ba3ff668ed573..e77afeba349bee1492b7d53d03f3f8e00c973429 100644
|
| --- a/third_party/pkg/angular/lib/tools/expression_extractor.dart
|
| +++ b/third_party/pkg/angular/lib/tools/expression_extractor.dart
|
| @@ -1,5 +1,6 @@
|
| library angular.tools.html_expression_extractor;
|
|
|
| +import 'dart:async';
|
| import 'dart:io';
|
| import 'package:angular/tools/html_extractor.dart';
|
| import 'package:angular/tools/source_metadata_extractor.dart';
|
| @@ -13,6 +14,7 @@ import 'package:di/dynamic_injector.dart';
|
|
|
| import 'package:angular/core/module.dart';
|
| import 'package:angular/core/parser/parser.dart';
|
| +import 'package:angular/tools/parser_getter_setter/generator.dart';
|
| import 'package:angular/tools/parser_generator/generator.dart';
|
|
|
| main(args) {
|
| @@ -26,11 +28,11 @@ main(args) {
|
| var packageRoots =
|
| (args.length < 6) ? [Platform.packageRoot] : args.sublist(5);
|
| var sourceCrawler = new SourceCrawlerImpl(packageRoots);
|
| - var sourceMetadataExtractor = new SourceMetadataExtractor(sourceCrawler);
|
| + var sourceMetadataExtractor = new SourceMetadataExtractor();
|
| List<DirectiveInfo> directives =
|
| - sourceMetadataExtractor.gatherDirectiveInfo(args[0]);
|
| - var htmlExtractor = new HtmlExpressionExtractor(directives, ioService);
|
| - htmlExtractor.crawl(args[1]);
|
| + sourceMetadataExtractor.gatherDirectiveInfo(args[0], sourceCrawler);
|
| + var htmlExtractor = new HtmlExpressionExtractor(directives);
|
| + htmlExtractor.crawl(args[1], ioService);
|
|
|
| var expressions = htmlExtractor.expressions;
|
| expressions.add('null');
|
| @@ -53,14 +55,19 @@ main(args) {
|
| printer.printSrc('// Found ${expressions.length} expressions');
|
| Module module = new Module()
|
| ..type(Parser, implementedBy: DynamicParser)
|
| - ..type(ParserBackend, implementedBy: DynamicParserBackend)
|
| + ..type(ParserBackend, implementedBy: DartGetterSetterGen)
|
| ..type(FilterMap, implementedBy: NullFilterMap)
|
| ..value(SourcePrinter, printer);
|
| Injector injector =
|
| new DynamicInjector(modules: [module], allowImplicitInjection: true);
|
|
|
| - // Run the generator.
|
| - injector.get(ParserGenerator).generateParser(htmlExtractor.expressions);
|
| + runZoned(() {
|
| + // Run the generator.
|
| + injector.get(ParserGetterSetter).generateParser(htmlExtractor.expressions);
|
| + }, zoneSpecification: new ZoneSpecification(print: (_, __, ___, String line) {
|
| + printer.printSrc(line);
|
| + }));
|
| +
|
|
|
| // Output footer last.
|
| if (footerFile != '') {
|
|
|