In AssertParse, by default assert that parsing does not produce any diagnostics

ahoppen · ahoppen · commit 856a350ab0fe · 2022-08-23T10:44:27.000+02:00
diff --git a/Tests/SwiftParserTest/Assertions.swift b/Tests/SwiftParserTest/Assertions.swift
@@ -51,7 +51,7 @@ func AssertEqualTokens(_ actual: [Lexer.Lexeme], _ expected: [Lexer.Lexeme], fil
 
 func AssertParse<Node: RawSyntaxNodeProtocol>(
   _ parseSyntax: (inout Parser) -> Node,
-  allowErrors: Bool = true,
+  allowErrors: Bool = false,
   file: StaticString = #file,
   line: UInt = #line,
   _ source: () -> String
diff --git a/Tests/SwiftParserTest/Declarations.swift b/Tests/SwiftParserTest/Declarations.swift
@@ -139,7 +139,7 @@ final class DeclarationTests: XCTestCase {
       """
     }
 
-    try AssertParse({ $0.parseSourceFile() }) {
+    try AssertParse({ $0.parseSourceFile() }, allowErrors: true) {
       "_ = foo/* */?.description"
     }
     
diff --git a/Tests/SwiftParserTest/Expressions.swift b/Tests/SwiftParserTest/Expressions.swift
@@ -164,11 +164,11 @@ final class ExpressionTests: XCTestCase {
       """
     }
 
-    try AssertParse({ $0.parseExpression() }) {
+    try AssertParse({ $0.parseExpression() }, allowErrors: true) {
       "[,"
     }
 
-    try AssertParse({ $0.parseExpression() }) {
+    try AssertParse({ $0.parseExpression() }, allowErrors: true) {
       """
       ([1:)
       """
@@ -197,7 +197,7 @@ final class ExpressionTests: XCTestCase {
       """#
     }
 
-    try AssertParse({ $0.parseExpression() }) {
+    try AssertParse({ $0.parseExpression() }, allowErrors: true) {
       #"" >> \( abc } ) << ""#
     }
 
@@ -213,7 +213,7 @@ final class ExpressionTests: XCTestCase {
       """##
     }
 
-    try AssertParse({ $0.parseExpression() }) {
+    try AssertParse({ $0.parseExpression() }, allowErrors: true) {
       #""\","#
     }
 
@@ -249,35 +249,35 @@ final class ExpressionTests: XCTestCase {
         """
     }
 
-    try AssertParse({ $0.parseExpression() }, allowErrors: false) {
+    try AssertParse({ $0.parseExpression() }) {
       ##"""
       #"""#
       """##
     }
 
-    try AssertParse({ $0.parseExpression() }, allowErrors: false) {
+    try AssertParse({ $0.parseExpression() }) {
       ##"""
       #"""""#
       """##
     }
 
-    try AssertParse({ $0.parseExpression() }, allowErrors: false) {
+    try AssertParse({ $0.parseExpression() }) {
       ##"""
       #"""
       multiline raw
       """#
       """##
     }
 
-    try AssertParse({ $0.parseExpression() }, allowErrors: false) {
+    try AssertParse({ $0.parseExpression() }) {
       #"""
       "\(x)"
       """#
     }
   }
 
   func testRangeSubscript() throws {
-    try AssertParse({ $0.parseExpression() }, allowErrors: false) {
+    try AssertParse({ $0.parseExpression() }) {
       """
       text[...]
       """
diff --git a/Tests/SwiftParserTest/RecoveryTests.swift b/Tests/SwiftParserTest/RecoveryTests.swift
@@ -19,8 +19,8 @@ public class RecoveryTests: XCTestCase {
   }
 
   func testBogusKeypathBaseRecovery() throws {
-    try AssertParse({ $0.parseSourceFile() }) {
-      "func nestThoseIfs() {\\n    if false != true {\\n       print \"\\(i)\"\\n"
+    try AssertParse({ $0.parseSourceFile() }, allowErrors: true) {
+      #"func nestThoseIfs() {\n    if false != true {\n       print "\(i)\"\n"#
     }
   }
 
@@ -37,7 +37,7 @@ public class RecoveryTests: XCTestCase {
   }
 
   func testMissingSubscriptReturnClause() throws {
-    try AssertParse({ $0.parseSourceFile() }) {
+    try AssertParse({ $0.parseSourceFile() }, allowErrors: true) {
       """
       struct Foo {
         subscript(x: String) {}
@@ -55,7 +55,7 @@ public class RecoveryTests: XCTestCase {
   }
 
   func testClassWithLeadingNumber() throws {
-    try AssertParse({ $0.parseSourceFile() }) {
+    try AssertParse({ $0.parseSourceFile() }, allowErrors: true) {
       """
       class 23class {
         // expected-error@-1 {{class name can only start with a letter or underscore, not a number}}
@@ -82,7 +82,7 @@ public class RecoveryTests: XCTestCase {
   }
 
   func testMissingArrowInArrowExpr() throws {
-    try AssertParse({ $0.parseSourceFile() }) {
+    try AssertParse({ $0.parseSourceFile() }, allowErrors: true) {
       """
       [(Int) -> throws Int]()
       let _ = [Int throws Int]()
@@ -130,7 +130,7 @@ public class RecoveryTests: XCTestCase {
   }
 
   func testStringBogusClosingDelimiters() throws {
-    try AssertParse({ $0.parseSourceFile() }) {
+    try AssertParse({ $0.parseSourceFile() }, allowErrors: true) {
       #"\\("#
     }
 
@@ -140,21 +140,21 @@ public class RecoveryTests: XCTestCase {
       """##
     }
 
-    try AssertParse({ $0.parseStringLiteral() }) {
+    try AssertParse({ $0.parseStringLiteral() }, allowErrors: true) {
       #"""
       "
       """#
     }
 
-    try AssertParse({ $0.parseStringLiteral() }) {
+    try AssertParse({ $0.parseStringLiteral() }, allowErrors: true) {
       #"""
       "'
       """#
     }
   }
 
   func testMissingArgumentToAttribute() throws {
-    try AssertParse({ $0.parseSourceFile() }) {
+    try AssertParse({ $0.parseSourceFile() }, allowErrors: true) {
       """
       @_dynamicReplacement(
       func test_dynamic_replacement_for2() {
@@ -193,7 +193,7 @@ public class RecoveryTests: XCTestCase {
   }
 
   func testExpressionMember() throws {
-    try AssertParse({ $0.parseSourceFile() }) {
+    try AssertParse({ $0.parseSourceFile() }, allowErrors: true) {
       """
       struct S {
         / ###line 25 "line-directive.swift"
@@ -213,7 +213,7 @@ public class RecoveryTests: XCTestCase {
   }
 
   func testExtraSyntaxInDirective() throws {
-    try AssertParse({ $0.parseDeclaration() }) {
+    try AssertParse({ $0.parseDeclaration() }, allowErrors: true) {
       """
       #if os(iOS)
         func foo() {}
@@ -343,7 +343,7 @@ public class RecoveryTests: XCTestCase {
   }
 
   func testTextRecovery() throws {
-    try AssertParse({ $0.parseSourceFile() }) {
+    try AssertParse({ $0.parseSourceFile() }, allowErrors: true) {
       """
       Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
       """
diff --git a/Tests/SwiftParserTest/Statements.swift b/Tests/SwiftParserTest/Statements.swift
@@ -10,7 +10,7 @@ final class StatementTests: XCTestCase {
       """
     }
 
-    try AssertParse({ $0.parseIfStatement() }) {
+    try AssertParse({ $0.parseIfStatement() }, allowErrors: true) {
       """
       if case* ! = x {
         bar()

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ final class DeclarationTests: XCTestCase {`
`139`	`139`	`"""`
`140`	`140`	`}`
`141`	`141`
`142`		`- try AssertParse({ $0.parseSourceFile() }) {`
	`142`	`+ try AssertParse({ $0.parseSourceFile() }, allowErrors: true) {`
`143`	`143`	`"_ = foo/* */?.description"`
`144`	`144`	`}`
`145`	`145`
Original file line number	Diff line number	Diff line change
`@@ -164,11 +164,11 @@ final class ExpressionTests: XCTestCase {`
`164`	`164`	`"""`
`165`	`165`	`}`
`166`	`166`
`167`		`- try AssertParse({ $0.parseExpression() }) {`
	`167`	`+ try AssertParse({ $0.parseExpression() }, allowErrors: true) {`
`168`	`168`	`"[,"`
`169`	`169`	`}`
`170`	`170`
`171`		`- try AssertParse({ $0.parseExpression() }) {`
	`171`	`+ try AssertParse({ $0.parseExpression() }, allowErrors: true) {`
`172`	`172`	`"""`
`173`	`173`	`([1:)`
`174`	`174`	`"""`
`@@ -197,7 +197,7 @@ final class ExpressionTests: XCTestCase {`
`197`	`197`	`"""#`
`198`	`198`	`}`
`199`	`199`
`200`		`- try AssertParse({ $0.parseExpression() }) {`
	`200`	`+ try AssertParse({ $0.parseExpression() }, allowErrors: true) {`
`201`	`201`	`#"" >> \( abc } ) << ""#`
`202`	`202`	`}`
`203`	`203`
`@@ -213,7 +213,7 @@ final class ExpressionTests: XCTestCase {`
`213`	`213`	`"""##`
`214`	`214`	`}`
`215`	`215`
`216`		`- try AssertParse({ $0.parseExpression() }) {`
	`216`	`+ try AssertParse({ $0.parseExpression() }, allowErrors: true) {`
`217`	`217`	`#""\","#`
`218`	`218`	`}`
`219`	`219`
`@@ -249,35 +249,35 @@ final class ExpressionTests: XCTestCase {`
`249`	`249`	`"""`
`250`	`250`	`}`
`251`	`251`
`252`		`- try AssertParse({ $0.parseExpression() }, allowErrors: false) {`
	`252`	`+ try AssertParse({ $0.parseExpression() }) {`
`253`	`253`	`##"""`
`254`	`254`	`#"""#`
`255`	`255`	`"""##`
`256`	`256`	`}`
`257`	`257`
`258`		`- try AssertParse({ $0.parseExpression() }, allowErrors: false) {`
	`258`	`+ try AssertParse({ $0.parseExpression() }) {`
`259`	`259`	`##"""`
`260`	`260`	`#"""""#`
`261`	`261`	`"""##`
`262`	`262`	`}`
`263`	`263`
`264`		`- try AssertParse({ $0.parseExpression() }, allowErrors: false) {`
	`264`	`+ try AssertParse({ $0.parseExpression() }) {`
`265`	`265`	`##"""`
`266`	`266`	`#"""`
`267`	`267`	`multiline raw`
`268`	`268`	`"""#`
`269`	`269`	`"""##`
`270`	`270`	`}`
`271`	`271`
`272`		`- try AssertParse({ $0.parseExpression() }, allowErrors: false) {`
	`272`	`+ try AssertParse({ $0.parseExpression() }) {`
`273`	`273`	`#"""`
`274`	`274`	`"\(x)"`
`275`	`275`	`"""#`
`276`	`276`	`}`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`func testRangeSubscript() throws {`
`280`		`- try AssertParse({ $0.parseExpression() }, allowErrors: false) {`
	`280`	`+ try AssertParse({ $0.parseExpression() }) {`
`281`	`281`	`"""`
`282`	`282`	`text[...]`
`283`	`283`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ public class RecoveryTests: XCTestCase {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`func testBogusKeypathBaseRecovery() throws {`
`22`		`- try AssertParse({ $0.parseSourceFile() }) {`
`23`		`- "func nestThoseIfs() {\\n if false != true {\\n print \"\\(i)\"\\n"`
	`22`	`+ try AssertParse({ $0.parseSourceFile() }, allowErrors: true) {`
	`23`	`+ #"func nestThoseIfs() {\n if false != true {\n print "\(i)\"\n"#`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`@@ -37,7 +37,7 @@ public class RecoveryTests: XCTestCase {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`func testMissingSubscriptReturnClause() throws {`
`40`		`- try AssertParse({ $0.parseSourceFile() }) {`
	`40`	`+ try AssertParse({ $0.parseSourceFile() }, allowErrors: true) {`
`41`	`41`	`"""`
`42`	`42`	`struct Foo {`
`43`	`43`	`subscript(x: String) {}`
`@@ -55,7 +55,7 @@ public class RecoveryTests: XCTestCase {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`func testClassWithLeadingNumber() throws {`
`58`		`- try AssertParse({ $0.parseSourceFile() }) {`
	`58`	`+ try AssertParse({ $0.parseSourceFile() }, allowErrors: true) {`
`59`	`59`	`"""`
`60`	`60`	`class 23class {`
`61`	`61`	`// expected-error@-1 {{class name can only start with a letter or underscore, not a number}}`
`@@ -82,7 +82,7 @@ public class RecoveryTests: XCTestCase {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`func testMissingArrowInArrowExpr() throws {`
`85`		`- try AssertParse({ $0.parseSourceFile() }) {`
	`85`	`+ try AssertParse({ $0.parseSourceFile() }, allowErrors: true) {`
`86`	`86`	`"""`
`87`	`87`	`[(Int) -> throws Int]()`
`88`	`88`	`let _ = [Int throws Int]()`
`@@ -130,7 +130,7 @@ public class RecoveryTests: XCTestCase {`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`func testStringBogusClosingDelimiters() throws {`
`133`		`- try AssertParse({ $0.parseSourceFile() }) {`
	`133`	`+ try AssertParse({ $0.parseSourceFile() }, allowErrors: true) {`
`134`	`134`	`#"\\("#`
`135`	`135`	`}`
`136`	`136`
`@@ -140,21 +140,21 @@ public class RecoveryTests: XCTestCase {`
`140`	`140`	`"""##`
`141`	`141`	`}`
`142`	`142`
`143`		`- try AssertParse({ $0.parseStringLiteral() }) {`
	`143`	`+ try AssertParse({ $0.parseStringLiteral() }, allowErrors: true) {`
`144`	`144`	`#"""`
`145`	`145`	`"`
`146`	`146`	`"""#`
`147`	`147`	`}`
`148`	`148`
`149`		`- try AssertParse({ $0.parseStringLiteral() }) {`
	`149`	`+ try AssertParse({ $0.parseStringLiteral() }, allowErrors: true) {`
`150`	`150`	`#"""`
`151`	`151`	`"'`
`152`	`152`	`"""#`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`func testMissingArgumentToAttribute() throws {`
`157`		`- try AssertParse({ $0.parseSourceFile() }) {`
	`157`	`+ try AssertParse({ $0.parseSourceFile() }, allowErrors: true) {`
`158`	`158`	`"""`
`159`	`159`	`@_dynamicReplacement(`
`160`	`160`	`func test_dynamic_replacement_for2() {`
`@@ -193,7 +193,7 @@ public class RecoveryTests: XCTestCase {`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`func testExpressionMember() throws {`
`196`		`- try AssertParse({ $0.parseSourceFile() }) {`
	`196`	`+ try AssertParse({ $0.parseSourceFile() }, allowErrors: true) {`
`197`	`197`	`"""`
`198`	`198`	`struct S {`
`199`	`199`	`/ ###line 25 "line-directive.swift"`
`@@ -213,7 +213,7 @@ public class RecoveryTests: XCTestCase {`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`func testExtraSyntaxInDirective() throws {`
`216`		`- try AssertParse({ $0.parseDeclaration() }) {`
	`216`	`+ try AssertParse({ $0.parseDeclaration() }, allowErrors: true) {`
`217`	`217`	`"""`
`218`	`218`	`#if os(iOS)`
`219`	`219`	`func foo() {}`
`@@ -343,7 +343,7 @@ public class RecoveryTests: XCTestCase {`
`343`	`343`	`}`
`344`	`344`
`345`	`345`	`func testTextRecovery() throws {`
`346`		`- try AssertParse({ $0.parseSourceFile() }) {`
	`346`	`+ try AssertParse({ $0.parseSourceFile() }, allowErrors: true) {`
`347`	`347`	`"""`
`348`	`348`	`Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.`
`349`	`349`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ final class StatementTests: XCTestCase {`
`10`	`10`	`"""`
`11`	`11`	`}`
`12`	`12`
`13`		`- try AssertParse({ $0.parseIfStatement() }) {`
	`13`	`+ try AssertParse({ $0.parseIfStatement() }, allowErrors: true) {`
`14`	`14`	`"""`
`15`	`15`	`if case* ! = x {`
`16`	`16`	`bar()`