Lookahead in parseList, not isStartOf{Decl,Stmt}.

Fixed whitespace.

Author: nate-chandler

lib/Parse/ParseDecl.cpp

@@ -2589,8 +2589,6 @@ bool Parser::isStartOfDecl() {
   // If this is obviously not the start of a decl, then we're done.
   if (!isKeywordPossibleDeclStart(Tok)) return false;
 
-  if (peekToken().is(tok::colon)) return false;
-
   // When 'init' appears inside another 'init', it's likely the user wants to
   // invoke an initializer but forgets to prefix it with 'self.' or 'super.'
   // Otherwise, expect 'init' to be the start of a declaration (and complain

lib/Parse/ParseExpr.cpp

@@ -3466,7 +3466,7 @@ ParserResult<Expr> Parser::parseExprCollection() {
         break;
 
     if (Tok.isAtStartOfLine())
-        continue;
+      continue;
 
       diagnose(Tok, diag::expected_separator, ",")
           .fixItInsertAfter(PreviousLoc, ",");

lib/Parse/ParseStmt.cpp

@@ -62,7 +62,6 @@ bool Parser::isStartOfStmt() {
   case tok::pound_warning:
   case tok::pound_error:
   case tok::pound_sourceLocation:
-    if (peekToken().is(tok::colon)) return false;
     return true;
 
   case tok::pound_line:

lib/Parse/Parser.cpp

@@ -1015,9 +1015,19 @@ Parser::parseList(tok RightK, SourceLoc LeftLoc, SourceLoc &RightLoc,
       }
       break;
     }
+
+    // If the next token is at the beginning of a new line, could be an argument
+    // label, is followed by a colon, and separator omission is permitted, 
+    // expect that we'll parse another list element which begins with that 
+    // argument label and continue parsing the list.
+    if (Tok.isAtStartOfLine() && AllowSepOmission && Tok.canBeArgumentLabel() 
+        && peekToken().is(tok::colon)) { 
+      continue;
+    }
+
     // If we're in a comma-separated list, the next token is at the
     // beginning of a new line and can never start an element, break.
-    if (Tok.isAtStartOfLine() && 
+    if (Tok.isAtStartOfLine() &&
         (Tok.is(tok::r_brace) || isStartOfDecl() || isStartOfStmt())) {
       break;
     }