Support map and list literals in analyzer2dart.

pkg/analyzer2dart/test/end2end_test.dart

Index: pkg/analyzer2dart/test/end2end_test.dart
diff --git a/pkg/analyzer2dart/test/end2end_test.dart b/pkg/analyzer2dart/test/end2end_test.dart
index 8bdbfffaa2e3b25770a38453e02c4a22054ecc39..21f2652731a44987588b08707091ce2208950178 100644
--- a/pkg/analyzer2dart/test/end2end_test.dart
+++ b/pkg/analyzer2dart/test/end2end_test.dart
@@ -203,10 +203,6 @@ main() {
 main(a) {
   return a.foo;
 }
-''', '''

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

Removing redundant expected results.

-main(a) {
-  return a.foo;
-}
 ''');
 
     checkResult('''
@@ -226,10 +222,6 @@ main() {
 main(a) {
   return a.foo(0);
 }
-''', '''
-main(a) {
-  return a.foo(0);
-}
 ''');
 
     checkResult('''
@@ -249,160 +241,96 @@ main() {
 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('''
@@ -419,20 +347,12 @@ main(a) {
 main(a) {
   return a || deprecated;
 }
-''', '''
-main(a) {
-  return a || deprecated;
-}
 ''');
 
     checkResult('''
 main(a) {
   return a && deprecated;
 }
-''', '''
-main(a) {
-  return a && deprecated;
-}
 ''');
   });
 
@@ -443,12 +363,6 @@ main(a) {
     print(0);
   }
 }
-''', '''
-main(a) {
-  if (a) {
-    print(0);
-  }
-}
 ''');
 
     checkResult('''
@@ -474,15 +388,6 @@ main(a) {
     print(2);
   }
 }
-''', '''
-main(a) {
-  if (a) {
-    print(0);
-  } else {
-    print(1);
-    print(2);
-  }
-}
 ''');
   });
 
@@ -491,9 +396,81 @@ main(a) {
 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) {
-  return a ? print(0) : print(1);
+  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"}};
 }
 ''');
   });