Add more parser error recovery for List and Map literals

compiler/javatests/com/google/dart/compiler/parser/ParserRecoveryTest.java

Index: compiler/javatests/com/google/dart/compiler/parser/ParserRecoveryTest.java
diff --git a/compiler/javatests/com/google/dart/compiler/parser/ParserRecoveryTest.java b/compiler/javatests/com/google/dart/compiler/parser/ParserRecoveryTest.java
index 1140763e68d37b9a55351807f74297d2cd82514e..691022dbfb64fb6f17105e1d6b24664606773655 100644
--- a/compiler/javatests/com/google/dart/compiler/parser/ParserRecoveryTest.java
+++ b/compiler/javatests/com/google/dart/compiler/parser/ParserRecoveryTest.java
@@ -5,11 +5,13 @@
 package com.google.dart.compiler.parser;
 
 import com.google.common.base.Joiner;
+import com.google.dart.compiler.ast.DartArrayLiteral;
 import com.google.dart.compiler.ast.DartBinaryExpression;
 import com.google.dart.compiler.ast.DartClass;
 import com.google.dart.compiler.ast.DartExprStmt;
 import com.google.dart.compiler.ast.DartFieldDefinition;
 import com.google.dart.compiler.ast.DartIdentifier;
+import com.google.dart.compiler.ast.DartMapLiteral;
 import com.google.dart.compiler.ast.DartMethodDefinition;
 import com.google.dart.compiler.ast.DartPropertyAccess;
 import com.google.dart.compiler.ast.DartUnit;
@@ -445,4 +447,106 @@ public class ParserRecoveryTest extends AbstractParserTest {
     DartFieldDefinition after = (DartFieldDefinition)unit.getTopLevelNodes().get(2);
     assertEquals("after", after.getFields().get(0).getName().getName());
   }
+
+  public void testPropertyAccessInArrayLiteral1() {
+    DartUnit unit = parseUnitUnspecifiedErrors("phony_property_access_array_literal1.dart",
+        Joiner.on("\n").join(
+            "var before;",
+            "var bad = [foo.];",
+            "var after;"));
+    DartFieldDefinition before = (DartFieldDefinition)unit.getTopLevelNodes().get(0);
+    assertEquals("before", before.getFields().get(0).getName().getName());
+    DartFieldDefinition bad = (DartFieldDefinition)unit.getTopLevelNodes().get(1);
+    assertEquals("bad", bad.getFields().get(0).getName().getName());
+    DartArrayLiteral literal = (DartArrayLiteral)bad.getFields().get(0).getValue();
+    DartPropertyAccess foo = (DartPropertyAccess)literal.getExpressions().get(0);
+    assertEquals("foo", ((DartIdentifier)foo.getQualifier()).getName());
+    DartFieldDefinition after = (DartFieldDefinition)unit.getTopLevelNodes().get(2);
+    assertEquals("after", after.getFields().get(0).getName().getName());
+  }
+
+  public void testPropertyAccessInArrayLiteral2() {
+    DartUnit unit = parseUnitUnspecifiedErrors("phony_property_access_array_literal2.dart",
+        Joiner.on("\n").join(
+            "var before;",
+            "var bad = [foo.,];",
+            "var after;"));
+    DartFieldDefinition before = (DartFieldDefinition)unit.getTopLevelNodes().get(0);
+    assertEquals("before", before.getFields().get(0).getName().getName());
+    DartFieldDefinition bad = (DartFieldDefinition)unit.getTopLevelNodes().get(1);
+    assertEquals("bad", bad.getFields().get(0).getName().getName());
+    DartArrayLiteral literal = (DartArrayLiteral)bad.getFields().get(0).getValue();
+    DartPropertyAccess foo = (DartPropertyAccess)literal.getExpressions().get(0);
+    assertEquals("foo", ((DartIdentifier)foo.getQualifier()).getName());
+    DartFieldDefinition after = (DartFieldDefinition)unit.getTopLevelNodes().get(2);
+    assertEquals("after", after.getFields().get(0).getName().getName());
+  }
+
+  public void testPropertyAccessInArrayLiteral3() {
+    DartUnit unit = parseUnitUnspecifiedErrors("phony_property_access_array_literal2.dart",
+        Joiner.on("\n").join(
+            "var before;",
+            "var bad = [foo. + ];",
+            "var after;"));
+    DartFieldDefinition before = (DartFieldDefinition)unit.getTopLevelNodes().get(0);
+    assertEquals("before", before.getFields().get(0).getName().getName());
+    DartFieldDefinition bad = (DartFieldDefinition)unit.getTopLevelNodes().get(1);
+    assertEquals("bad", bad.getFields().get(0).getName().getName());
+    DartArrayLiteral literal = (DartArrayLiteral)bad.getFields().get(0).getValue();
+    DartPropertyAccess foo = (DartPropertyAccess)literal.getExpressions().get(0);
+    assertEquals("foo", ((DartIdentifier)foo.getQualifier()).getName());
+    DartFieldDefinition after = (DartFieldDefinition)unit.getTopLevelNodes().get(2);
+    assertEquals("after", after.getFields().get(0).getName().getName());
+  }
+
+  public void testPropertyAccessInMapLiteral1() {
+    DartUnit unit = parseUnitUnspecifiedErrors("phony_property_access_map_literal1.dart",
+        Joiner.on("\n").join(
+            "var before;",
+            "var bad = {\"key\" : foo.};",
+            "var after;"));
+    DartFieldDefinition before = (DartFieldDefinition)unit.getTopLevelNodes().get(0);
+    assertEquals("before", before.getFields().get(0).getName().getName());
+    DartFieldDefinition bad = (DartFieldDefinition)unit.getTopLevelNodes().get(1);
+    assertEquals("bad", bad.getFields().get(0).getName().getName());
+    DartMapLiteral literal = (DartMapLiteral)bad.getFields().get(0).getValue();
+    DartPropertyAccess foo = (DartPropertyAccess)literal.getEntries().get(0).getValue();
+    assertEquals("foo", ((DartIdentifier)foo.getQualifier()).getName());
+    DartFieldDefinition after = (DartFieldDefinition)unit.getTopLevelNodes().get(2);
+    assertEquals("after", after.getFields().get(0).getName().getName());
+  }
+
+  public void testPropertyAccessInMapLiteral2() {
+    DartUnit unit = parseUnitUnspecifiedErrors("phony_property_access_map_literal2.dart",
+        Joiner.on("\n").join(
+            "var before;",
+            "var bad = {\"key\" : foo.,};",
+            "var after;"));
+    DartFieldDefinition before = (DartFieldDefinition)unit.getTopLevelNodes().get(0);
+    assertEquals("before", before.getFields().get(0).getName().getName());
+    DartFieldDefinition bad = (DartFieldDefinition)unit.getTopLevelNodes().get(1);
+    assertEquals("bad", bad.getFields().get(0).getName().getName());
+    DartMapLiteral literal = (DartMapLiteral)bad.getFields().get(0).getValue();
+    DartPropertyAccess foo = (DartPropertyAccess)literal.getEntries().get(0).getValue();
+    assertEquals("foo", ((DartIdentifier)foo.getQualifier()).getName());
+    DartFieldDefinition after = (DartFieldDefinition)unit.getTopLevelNodes().get(2);
+    assertEquals("after", after.getFields().get(0).getName().getName());
+  }
+
+  public void testPropertyAccessInMapLiteral3() {
+    DartUnit unit = parseUnitUnspecifiedErrors("phony_property_access_map_literal3.dart",
+        Joiner.on("\n").join(
+            "var before;",
+            "var bad = {\"key\" : foo. +};",
+            "var after;"));
+    DartFieldDefinition before = (DartFieldDefinition)unit.getTopLevelNodes().get(0);
+    assertEquals("before", before.getFields().get(0).getName().getName());
+    DartFieldDefinition bad = (DartFieldDefinition)unit.getTopLevelNodes().get(1);
+    assertEquals("bad", bad.getFields().get(0).getName().getName());
+    DartMapLiteral literal = (DartMapLiteral)bad.getFields().get(0).getValue();
+    DartPropertyAccess foo = (DartPropertyAccess)literal.getEntries().get(0).getValue();
+    assertEquals("foo", ((DartIdentifier)foo.getQualifier()).getName());
+    DartFieldDefinition after = (DartFieldDefinition)unit.getTopLevelNodes().get(2);
+    assertEquals("after", after.getFields().get(0).getName().getName());
+  }
 }