Skip to content

Commit 4a24c1a

Browse files
alexeaglemprobst
authored andcommitted
Use the newer dart formatter, which gives better errors
1 parent 2dc7fa9 commit 4a24c1a

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

gulpfile.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,11 +352,21 @@ gulp.task('build/transpile.dart', transpile(gulp, gulpPlugins, {
352352

353353
var ts2dart = require('gulp-ts2dart');
354354
gulp.task('build/transpile.dart.ts2dart', function() {
355-
gulp.src('modules/angular2/src/di/*.js')
355+
gulp.src(['modules/angular2/src/di/*.js', 'modules/angular2/test/di/*.js', 'modules/angular2/src/test_lib/*.js'])
356356
.pipe(ts2dart.transpile())
357-
.pipe(ts2dart.format())
358357
.pipe(gulp.dest('dist/dart.ts2dart'))
359358
});
359+
gulp.task('build/format.dart.ts2dart', rundartpackage(gulp, gulpPlugins, {
360+
pub: DART_SDK.PUB,
361+
packageName: CONFIG.formatDart.packageName,
362+
args: ['dart_style:format', '-w', 'dist/dart.ts2dart']
363+
}));
364+
gulp.task('ts2dart', function(done) {
365+
runSequence(
366+
['build/transpile.dart.ts2dart', 'build/format.dart.ts2dart'],
367+
done
368+
);
369+
});
360370

361371
// ------------
362372
// html

modules/angular2/src/di/injector.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export class Injector {
2727
_defaultBindings:boolean;
2828
_asyncStrategy: _AsyncInjectorStrategy;
2929
_syncStrategy:_SyncInjectorStrategy;
30-
constructor(bindings:List, {parent=null, defaultBindings=false}={}) {
30+
constructor(bindings:List, parent=null, defaultBindings=false) {
3131
var flatten = _flattenBindings(bindings, MapWrapper.create());
3232
this._bindings = this._createListOfBindings(flatten);
3333
this._instances = this._createInstances();

0 commit comments

Comments
 (0)