commit a79126decb2f0117f1f6b2bcb2fd1cd0823ea21b
author Timothy Blasi <kegluneq@users.noreply.github.com> Wed Feb 11 09:51:00 2015 -0800
committer Timothy Blasi <kegluneq@users.noreply.github.com> Wed Feb 11 09:51:00 2015 -0800
tree 916f9a5ec74862558af728914cfac178f67ce7e0
parent 8ff3cf318c18345a5ac9b99e6c315313c11893f6
parent 46ff69607d320ee78d073a91bab21489385d8cb7

Merge pull request #21 from dart-lang/format

Use dart_style to avoid whitespace issues during testing.

lib/transformer.dart

diff --git a/lib/transformer.dart b/lib/transformer.dart
index 6374bbb..8133ba9 100644
--- a/lib/transformer.dart
+++ b/lib/transformer.dart
@@ -10,6 +10,7 @@
 import 'package:barback/barback.dart';
 import 'package:code_transformers/assets.dart';
 import 'package:code_transformers/resolver.dart';
+import 'package:dart_style/dart_style.dart';
 import 'package:glob/glob.dart';
 import 'package:html5lib/dom.dart' as dom;
 import 'package:html5lib/parser.dart' show parse;
@@ -286,13 +287,13 @@
         .forEach((lib, prefix) => _writeImport(lib, prefix, importsBuffer));
 
     // TODO(jakemac): copyright and library declaration
-    return '''
+    return new DartFormatter().format('''
 $importsBuffer
 main() {
 $initializersBuffer
   i0.main();
 }
-''';
+''');
   }
 
   _writeImport(LibraryElement lib, String prefix, StringBuffer buffer) {

pubspec.yaml

diff --git a/pubspec.yaml b/pubspec.yaml
index 6ea1c27..1ad78f1 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -6,6 +6,7 @@
 dependencies:
   barback: '>=0.14.2 <0.16.0'
   code_transformers: '>=0.2.3 <0.3.0'
+  dart_style: '>=0.1.3 <0.2.0'
   glob: ">=1.0.4 <2.0.0"
   html5lib: '>=0.12.0 <0.13.0'
   path: '>=1.3.0 <2.0.0'

test/transformer_test.dart

diff --git a/test/transformer_test.dart b/test/transformer_test.dart
index 02b749d..ac3b25e 100644
--- a/test/transformer_test.dart
+++ b/test/transformer_test.dart
@@ -4,12 +4,15 @@
 library initialize.transformer_test;
 
 import 'common.dart';
+import 'package:dart_style/dart_style.dart';
 import 'package:initialize/transformer.dart';
 import 'package:unittest/compact_vm_config.dart';
 
 main() {
   useCompactVMConfiguration();
 
+  var formatter = new DartFormatter();
+
   var htmlTransformer = new InitializeTransformer(['web/*.html']);
   var dartTransformer = new InitializeTransformer(['web/index.dart']);
 
@@ -70,7 +73,7 @@
           <script type="application/dart" src="index.initialize.dart"></script>
 
         </body></html>'''.replaceAll('        ', ''),
-    'a|web/index.initialize.dart': '''
+    'a|web/index.initialize.dart': formatter.format('''
         import 'package:initialize/src/static_loader.dart';
         import 'package:initialize/initialize.dart';
         import 'index.dart' as i0;
@@ -96,7 +99,7 @@
 
           i0.main();
         }
-        '''.replaceAll('        ', '')
+        ''')
   }, []);
 
   testPhases('constructor arguments', [[dartTransformer]], {
@@ -129,7 +132,7 @@
     'initialize|lib/initialize.dart': mockInitialize,
     'test_initializers|lib/common.dart': commonInitializers,
   }, {
-    'a|web/index.initialize.dart': '''
+    'a|web/index.initialize.dart': formatter.format('''
         import 'package:initialize/src/static_loader.dart';
         import 'package:initialize/initialize.dart';
         import 'index.dart' as i0;
@@ -152,6 +155,6 @@
 
           i0.main();
         }
-        '''.replaceAll('        ', '')
+        ''')
   }, []);
 }