Support map and list literals in analyzer2dart.

pkg/analyzer2dart/test/end2end_test.dart

 // Copyright (c) 2014, 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.
 
 /// End-to-end test of the analyzer2dart compiler.
 
 import 'dart:async';
 
 import 'mock_sdk.dart';
 import 'package:analyzer/file_system/memory_file_system.dart';
@@ skipping 185 matching lines @@
   return 0;
 }
 ''');
   });
 
   test('Dynamic access', () {
     checkResult('''
 main(a) {
   return a.foo;
 }
-''', '''

[Johnni Winther, 2014/10/21 10:27:04]

Removing redundant expected results.

-main(a) {
-  return a.foo;
-}
 ''');
 
     checkResult('''
 main() {
   var a = "";
   return a.foo;
 }
 ''', '''
 main() {
   return "".foo;
 }
 ''');
   });
 
   test('Dynamic invocation', () {
     checkResult('''
 main(a) {
   return a.foo(0);
 }
-''', '''
-main(a) {
-  return a.foo(0);
-}
 ''');
 
     checkResult('''
 main() {
   var a = "";
   return a.foo(0, 1);
 }
 ''', '''
 main() {
   return "".foo(0, 1);
 }
 ''');
   });
 
   test('Binary expressions', () {
     checkResult('''
 main(a) {
   return a + deprecated;
 }
-''', '''
-main(a) {
-  return a + deprecated;
-}
 ''');
 
     checkResult('''
 main(a) {
   return a - deprecated;
 }
-''', '''
-main(a) {
-  return a - deprecated;
-}
 ''');
 
     checkResult('''
 main(a) {
   return a * deprecated;
 }
-''', '''
-main(a) {
-  return a * deprecated;
-}
 ''');
 
     checkResult('''
 main(a) {
   return a / deprecated;
 }
-''', '''
-main(a) {
-  return a / deprecated;
-}
 ''');
 
     checkResult('''
 main(a) {
   return a ~/ deprecated;
 }
-''', '''
-main(a) {
-  return a ~/ deprecated;
-}
 ''');
 
     checkResult('''
 main(a) {
   return a % deprecated;
 }
-''', '''
-main(a) {
-  return a % deprecated;
-}
 ''');
 
     checkResult('''
 main(a) {
   return a < deprecated;
 }
-''', '''
-main(a) {
-  return a < deprecated;
-}
 ''');
 
     checkResult('''
 main(a) {
   return a <= deprecated;
 }
-''', '''
-main(a) {
-  return a <= deprecated;
-}
 ''');
 
     checkResult('''
 main(a) {
   return a > deprecated;
 }
-''', '''
-main(a) {
-  return a > deprecated;
-}
 ''');
 
     checkResult('''
 main(a) {
   return a >= deprecated;
 }
-''', '''
-main(a) {
-  return a >= deprecated;
-}
 ''');
 
     checkResult('''
 main(a) {
   return a << deprecated;
 }
-''', '''
-main(a) {
-  return a << deprecated;
-}
 ''');
 
     checkResult('''
 main(a) {
   return a >> deprecated;
 }
-''', '''
-main(a) {
-  return a >> deprecated;
-}
 ''');
 
     checkResult('''
 main(a) {
   return a & deprecated;
 }
-''', '''
-main(a) {
-  return a & deprecated;
-}
 ''');
 
     checkResult('''
 main(a) {
   return a | deprecated;
 }
-''', '''
-main(a) {
-  return a | deprecated;
-}
 ''');
 
     checkResult('''
 main(a) {
   return a ^ deprecated;
 }
-''', '''
-main(a) {
-  return a ^ deprecated;
-}
 ''');
 
     checkResult('''
 main(a) {
   return a == deprecated;
 }
-''', '''
-main(a) {
-  return a == deprecated;
-}
 ''');
 
     checkResult('''
 main(a) {
   return a != deprecated;
 }
 ''', '''
 main(a) {
   return !(a == deprecated);
 }
 ''');
 
     checkResult('''
 main(a) {
   return a || deprecated;
 }
-''', '''
-main(a) {
-  return a || deprecated;
-}
 ''');
 
     checkResult('''
 main(a) {
   return a && deprecated;
 }
-''', '''
-main(a) {
-  return a && deprecated;
-}
 ''');
   });
 
   test('If statement', () {
     checkResult('''
 main(a) {
   if (a) {
     print(0);
   }
 }
-''', '''
-main(a) {
-  if (a) {
-    print(0);
-  }
-}
 ''');
 
     checkResult('''
 main(a) {
   if (a) {
     print(0);
   } else {
     print(1);
   }
 }
 ''', '''
 main(a) {
   a ? print(0) : print(1);
 }
 ''');
 
     checkResult('''
 main(a) {
   if (a) {
     print(0);
   } else {
     print(1);
     print(2);
   }
 }
-''', '''
-main(a) {
-  if (a) {
-    print(0);
-  } else {
-    print(1);
-    print(2);
-  }
-}
 ''');
   });
 
   test('If statement', () {
     checkResult('''
 main(a) {
   return a ? print(0) : print(1);
 }
-''', '''
-main(a) {
-  return a ? print(0) : print(1);
-}
 ''');
   });
+
+  test('List literal', () {
+    checkResult('''
+main() {
+  return [];
+}
+''');
+
+    checkResult('''
+main() {
+  return <int>[];
+}
+''');
+
+    checkResult('''
+main() {
+  return <int>[0];
+}
+''');
+
+    checkResult('''
+main(a) {
+  return <int>[0, 1, a];
+}
+''');
+
+    checkResult('''
+main(a) {
+  return [0, [1], [a, <int>[3]]];
+}
+''');
+  });
+
+  test('Map literal', () {
+    checkResult('''
+main() {
+  return {};
+}
+''');
+
+    checkResult('''
+main() {
+  return <int, String>{};
+}
+''');
+
+    checkResult('''
+main() {
+  return <String, int>{"a": 0};
+}
+''');
+
+    // TODO(johnniwinther): Update expectations when issue 21369 has be
+    // resolved.
+    checkResult('''
+main(a) {
+  return <String, int>{"a": 0, "b": 1, "c": a};
+}
+''', '''
+main(a) {
+  var v0 = "a", v1 = "b", v2 = "c";
+  return <String, int>{v0: 0, v1: 1, v2: a};
+}
+''');
+
+    checkResult('''
+main(a) {
+  return {0: "a", 1: {2: "b"}, a: {3: "c"}};
+}
+''', '''
+main(a) {
+  var v0 = 0, v1 = 1;
+  return {v0: "a", v1: {2: "b"}, a: {3: "c"}};
+}
+''');
+  });
 }
 
 checkResult(String input, [String expectedOutput]) {
   if (expectedOutput == null) {
     expectedOutput = input;
   }
 
   CollectingOutputProvider outputProvider = new CollectingOutputProvider();
   MemoryResourceProvider provider = new MemoryResourceProvider();
   DartSdk sdk = new MockSdk();
@@ skipping 24 matching lines @@
     sb.write(text);
   }
 
   void addError(errorEvent, [StackTrace stackTrace]) {}
 
   void close() {}
 
   String get text => sb.toString();
 }