Handle map literals in conditional expression in PartialParser.skipExpression.

dart/sdk/lib/_internal/compiler/implementation/scanner/partial_parser.dart

Index: dart/sdk/lib/_internal/compiler/implementation/scanner/partial_parser.dart
diff --git a/dart/sdk/lib/_internal/compiler/implementation/scanner/partial_parser.dart b/dart/sdk/lib/_internal/compiler/implementation/scanner/partial_parser.dart
index 02f409aac925223384afdd0fd28a9109d0810ee2..3b666ae53d796e9e451068d1b7247de2a5f37394 100644
--- a/dart/sdk/lib/_internal/compiler/implementation/scanner/partial_parser.dart
+++ b/dart/sdk/lib/_internal/compiler/implementation/scanner/partial_parser.dart
@@ -34,7 +34,9 @@ class PartialParser extends Parser {
           (identical(value, ',')) ||
           (identical(value, ']')))
         return token;
-      if (identical(value, '=')) {
+      if (identical(value, '=') ||
+          identical(value, '?') ||
+          identical(value, ':')) {
         var nextValue = token.next.stringValue;
         if (identical(nextValue, 'const')) {
           token = token.next;
@@ -45,6 +47,7 @@ class PartialParser extends Parser {
           // class Foo {
           //   var map;
           //   Foo() : map = {};
+          //   Foo.x() : map = true ? {} : {};
           // }
           BeginGroupToken begin = token.next;
           token = (begin.endGroup != null) ? begin.endGroup : token;
@@ -56,6 +59,7 @@ class PartialParser extends Parser {
           // class Foo {
           //   var map;
           //   Foo() : map = <String, Foo>{};
+          //   Foo.x() : map = true ? <String, Foo>{} : <String, Foo>{};
           // }
           BeginGroupToken begin = token.next;
           token = (begin.endGroup != null) ? begin.endGroup : token;