support more types of expressions

test/transformer_test.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 library initialize.transformer_test;
 
 import 'common.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:dart_style/dart_style.dart';
 import 'package:initialize/transformer.dart';
 import 'package:unittest/compact_vm_config.dart';
@@ skipping 99 matching lines @@
   }, []);
 }
 
 void dartEntryPointTests() {
   var phases = [[new InitializeTransformer(['web/index.dart'])]];
 
   testPhases('constructor arguments', phases, {
     'a|web/index.dart': '''
         @DynamicInit(foo)
         @DynamicInit(Foo.foo)
+        @DynamicInit(bar.Foo.bar)
+        @DynamicInit(bar.Foo.foo)
         @DynamicInit(const [foo, Foo.foo, 'foo'])
         @DynamicInit(const {'foo': foo, 'Foo.foo': Foo.foo, 'bar': 'bar'})
         @DynamicInit('foo')
         @DynamicInit(true)
         @DynamicInit(null)
         @DynamicInit(1)
         @DynamicInit(1.1)
+        @DynamicInit('foo-\$x\${y}')
+        @DynamicInit(1 + 2)
+        @DynamicInit(1.0 + 0.2)
+        @DynamicInit(1 == 1)
         @NamedArgInit(1, name: 'Bill')
         library web_foo;
 
         import 'package:test_initializers/common.dart';
         import 'foo.dart';
+        import 'foo.dart' as bar;
+
+        const x = 'x';
+        const y = 'y';
+
+        class MyConst {
+          const MyConst;
+        }
         ''',
     'a|web/foo.dart': '''
         library foo;
 
         const String foo = 'foo';
 
+        class Bar {
+          const Bar();
+        }
+
         class Foo {
           static foo = 'Foo.foo';
+          static bar = const Bar();
         }
         ''',
     // Mock out the Initialize package plus some initializers.
     'initialize|lib/initialize.dart': mockInitialize,
     'test_initializers|lib/common.dart': commonInitializers,
   }, {
     'a|web/index.initialize.dart': formatter.format('''
         import 'package:initialize/src/static_loader.dart';
         import 'package:initialize/initialize.dart';
         import 'index.dart' as i0;
         import 'package:test_initializers/common.dart' as i1;
         import 'foo.dart' as i2;
 
         main() {
           initializers.addAll([
             new InitEntry(const i1.DynamicInit(i2.foo), const LibraryIdentifier(#web_foo, null, 'index.dart')),
             new InitEntry(const i1.DynamicInit(i2.Foo.foo), const LibraryIdentifier(#web_foo, null, 'index.dart')),
+            new InitEntry(const i1.DynamicInit(i2.Foo.bar), const LibraryIdentifier(#web_foo, null, 'index.dart')),
+            new InitEntry(const i1.DynamicInit(i2.Foo.foo), const LibraryIdentifier(#web_foo, null, 'index.dart')),
             new InitEntry(const i1.DynamicInit(const [i2.foo, i2.Foo.foo, 'foo']), const LibraryIdentifier(#web_foo, null, 'index.dart')),
             new InitEntry(const i1.DynamicInit(const {'foo': i2.foo, 'Foo.foo': i2.Foo.foo, 'bar': 'bar'}), const LibraryIdentifier(#web_foo, null, 'index.dart')),
             new InitEntry(const i1.DynamicInit('foo'), const LibraryIdentifier(#web_foo, null, 'index.dart')),
             new InitEntry(const i1.DynamicInit(true), const LibraryIdentifier(#web_foo, null, 'index.dart')),
             new InitEntry(const i1.DynamicInit(null), const LibraryIdentifier(#web_foo, null, 'index.dart')),
             new InitEntry(const i1.DynamicInit(1), const LibraryIdentifier(#web_foo, null, 'index.dart')),
             new InitEntry(const i1.DynamicInit(1.1), const LibraryIdentifier(#web_foo, null, 'index.dart')),
+            new InitEntry(const i1.DynamicInit('foo-xy'), const LibraryIdentifier(#web_foo, null, 'index.dart')),
+            new InitEntry(const i1.DynamicInit(3), const LibraryIdentifier(#web_foo, null, 'index.dart')),
+            new InitEntry(const i1.DynamicInit(1.2), const LibraryIdentifier(#web_foo, null, 'index.dart')),
+            new InitEntry(const i1.DynamicInit(true), const LibraryIdentifier(#web_foo, null, 'index.dart')),
             new InitEntry(const i1.NamedArgInit(1, name: 'Bill'), const LibraryIdentifier(#web_foo, null, 'index.dart')),
           ]);
 
           i0.main();
         }
         ''')
   }, []);
 }
 
 class SkipConstructorsPlugin extends InitializerPlugin {
@@ skipping 50 matching lines @@
           initializers.addAll([
             new InitEntry(i2.initMethod, i1.foo),
             new InitEntry(i2.initMethod, i0.index),
           ]);
 
           i0.main();
         }
         ''')
   }, []);
 }