Handle map literals in conditional expression in PartialParser.skipExpression.

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

 // Copyright (c) 2011, 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.
 
 part of scanner;
 
 class PartialParser extends Parser {
   PartialParser(Listener listener) : super(listener);
 
   Token parseClassBody(Token token) => skipClassBody(token);
@@ skipping 16 matching lines @@
 
   Token skipExpression(Token token) {
     while (true) {
       final kind = token.kind;
       final value = token.stringValue;
       if ((identical(kind, EOF_TOKEN)) ||
           (identical(value, ';')) ||
           (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;
           nextValue = token.next.stringValue;
         }
         if (identical(nextValue, '{')) {
           // Handle cases like this:
           // class Foo {
           //   var map;
           //   Foo() : map = {};
+          //   Foo.x() : map = true ? {} : {};
           // }
           BeginGroupToken begin = token.next;
           token = (begin.endGroup != null) ? begin.endGroup : token;
           token = token.next;
           continue;
         }
         if (identical(nextValue, '<')) {
           // Handle cases like this:
           // 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;
           token = token.next;
           if (identical(token.stringValue, '{')) {
             begin = token;
             token = (begin.endGroup != null) ? begin.endGroup : token;
             token = token.next;
           }
           continue;
@@ skipping 52 matching lines @@
         return token;
       }
       return listener.unexpected(token);
     }
     BeginGroupToken beginGroupToken = token;
     Token endToken = beginGroupToken.endGroup;
     listener.endFormalParameters(0, token, endToken);
     return endToken.next;
   }
 }