[Parse] Don't emit missing closing paren error if seeing any errors

Author: rintaro

lib/Parse/Parser.cpp

@@ -715,7 +715,10 @@ Parser::parseList(tok RightK, SourceLoc LeftLoc, SourceLoc &RightLoc,
     }
   }
 
-  if (parseMatchingToken(RightK, RightLoc, ErrorDiag, LeftLoc)) {
+  if (Status.isError()) {
+    // If we've already got errors, don't emit missing RightK diagnostics.
+    RightLoc = Tok.is(RightK) ? consumeToken() : PreviousLoc;
+  } else if (parseMatchingToken(RightK, RightLoc, ErrorDiag, LeftLoc)) {
     Status.setIsParseError();
   }
 

test/Parse/invalid.swift

@@ -15,18 +15,18 @@ func test2(inout let x : Int) {}  // expected-error {{parameter may not have mul
 func test3(f : (inout _ x : Int) -> Void) {} // expected-error {{'inout' before a parameter name is not allowed, place it before the parameter type instead}}
 
 func test3() {
-  undeclared_func( // expected-error {{use of unresolved identifier 'undeclared_func'}} expected-note {{to match this opening '('}}
-} // expected-error {{expected expression in list of expressions}} expected-error {{expected ')' in expression list}}
+  undeclared_func( // expected-error {{use of unresolved identifier 'undeclared_func'}}
+} // expected-error {{expected expression in list of expressions}}
 
 func runAction() {} // expected-note {{did you mean 'runAction'?}}
 
 // rdar://16601779
 func foo() {
-  runAction(SKAction.sequence() // expected-error {{use of unresolved identifier 'SKAction'}} expected-note {{to match this opening '('}} expected-error {{expected ',' separator}} {{32-32=,}}
+  runAction(SKAction.sequence() // expected-error {{use of unresolved identifier 'SKAction'}} expected-error {{expected ',' separator}} {{32-32=,}}
 
     skview!
     // expected-error @-1 {{use of unresolved identifier 'skview'}}
-} // expected-error {{expected ')' in expression list}}
+}
 
 super.init() // expected-error {{'super' cannot be used outside of class members}}
 
@@ -38,7 +38,7 @@ switch state { // expected-error {{use of unresolved identifier 'state'}}
 // rdar://18926814
 func test4() {
   let abc = 123
-  _ = " >> \( abc } ) << " // expected-note {{to match this opening '('}}  expected-error {{expected ')' in expression list}} expected-error {{expected ',' separator}} {{18-18=,}}  expected-error {{expected expression in list of expressions}}  expected-error {{extra tokens after interpolated string expression}}
+  _ = " >> \( abc } ) << " // expected-error {{expected ',' separator}} {{18-18=,}}  expected-error {{expected expression in list of expressions}}  expected-error {{extra tokens after interpolated string expression}}
 
 }
 

test/Parse/object_literals.swift

@@ -3,4 +3,4 @@
 let _ = [##] // expected-error{{expected identifier after '#' in object literal expression}} expected-error{{object literal syntax no longer uses '[# ... #]'}} {{9-10=}} {{11-13=}}
 let _ = [#what#] // expected-error{{object literal syntax no longer uses '[# ... #]'}} {{9-10=}} {{15-17=}}
 let _ = [#what()#] // expected-error{{object literal syntax no longer uses '[# ... #]'}} {{9-10=}} {{17-19=}}
-let _ = [#colorLiteral( // expected-error@+1 {{expected expression in list of expressions}} expected-error @+1 {{expected ')' in expression list}} expected-note {{to match this opening '('}}
+let _ = [#colorLiteral( // expected-error@+1 {{expected expression in list of expressions}}

test/Parse/recovery.swift

@@ -523,8 +523,7 @@ case let (jeb):
 // rdar://19605164
 // expected-error@+2{{use of undeclared type 'S'}}
 struct Foo19605164 {
-func a(s: S[{{g) -> Int {} // expected-note {{to match this opening '('}}
-// expected-error@+3 {{expected ')' in parameter}}
+func a(s: S[{{g) -> Int {}
 // expected-error@+2 {{expected parameter name followed by ':'}}
 // expected-error@+1 {{expected ',' separator}}
 }}}

test/expr/expressions.swift

@@ -457,10 +457,10 @@ func stringliterals(_ d: [String: Int]) {
   // expected-error @-2 {{unterminated string literal}} expected-error @-1 {{unterminated string literal}}
 
   // expected-warning @+2 {{initialization of variable 'x2' was never used; consider replacing with assignment to '_' or removing it}}
-  // expected-error @+1 {{unterminated string literal}} expected-note @+1 {{to match this opening '('}}
+  // expected-error @+1 {{unterminated string literal}}
   var x2 : () = ("hello" + "
   ;
-} // expected-error {{expected ')' in expression list}}
+}
 
 func testSingleQuoteStringLiterals() {
   _ = 'abc' // expected-error{{single-quoted string literal found, use '"'}}{{7-12="abc"}}
@@ -689,7 +689,7 @@ func dictionaryLiterals() {
 func invalidDictionaryLiteral() {
   // FIXME: lots of unnecessary diagnostics.
 
-  var a = [1: ; // expected-error {{expected value in dictionary literal}} expected-error {{expected ']' in container literal expression}} expected-note {{to match this opening '['}}
+  var a = [1: ; // expected-error {{expected value in dictionary literal}}
   var b = [1: ;] // expected-error {{expected value in dictionary literal}}
   var c = [1: "one" ;] // expected-error {{expected key expression in dictionary literal}} expected-error {{expected ',' separator}} {{20-20=,}}
   var d = [1: "one", ;] // expected-error {{expected key expression in dictionary literal}}