Merge pull request #965 from ahoppen/ahoppen/audit-tests

Audit GenericDisambiguationTests.swift and ForeachTests.swift

Author: ahoppen

Tests/SwiftParserTest/translated/ForeachAsyncTests.swift

@@ -68,13 +68,7 @@ final class ForeachAsyncTests: XCTestCase {
       }
       """,
       diagnostics: [
-        // TODO: Old parser expected error on line 21: found an unexpected second identifier in constant declaration
-        // TODO: Old parser expected note on line 21: join the identifiers together
-        // TODO: Old parser expected note on line 21: join the identifiers together with camel-case
-        // TODO: Old parser expected error on line 21: expected 'in' after for-each pattern
-        // TODO: Old parser expected error on line 21: expected Sequence expression for for-each loop
         DiagnosticSpec(locationMarker: "1️⃣", message: "expected 'in' in 'for' statement"),
-        // TODO: Old parser expected error on line 23: expected '{' to start the body of for-each loop
         DiagnosticSpec(locationMarker: "2️⃣", message: "expected '{' in 'for' statement"),
         DiagnosticSpec(locationMarker: "3️⃣", message: "expected '}' to end 'for' statement"),
       ]

Tests/SwiftParserTest/translated/ForeachTests.swift

@@ -45,13 +45,7 @@ final class ForeachTests: XCTestCase {
       }
       """,
       diagnostics: [
-        // TODO: Old parser expected error on line 21: found an unexpected second identifier in constant declaration
-        // TODO: Old parser expected note on line 21: join the identifiers together
-        // TODO: Old parser expected note on line 21: join the identifiers together with camel-case
-        // TODO: Old parser expected error on line 21: expected 'in' after for-each pattern
-        // TODO: Old parser expected error on line 21: expected Sequence expression for for-each loop
         DiagnosticSpec(locationMarker: "1️⃣", message: "expected 'in' in 'for' statement"),
-        // TODO: Old parser expected error on line 23: expected '{' to start the body of for-each loop
         DiagnosticSpec(locationMarker: "2️⃣", message: "expected '{' in 'for' statement"),
         DiagnosticSpec(locationMarker: "3️⃣", message: "expected '}' to end 'for' statement"),
       ]

Tests/SwiftParserTest/translated/GenericDisambiguationTests.swift

@@ -1,5 +1,7 @@
 // This test file has been translated from swift/test/Parse/generic_disambiguation.swift
 
+import SwiftSyntax
+
 import XCTest
 
 final class GenericDisambiguationTests: XCTestCase {
@@ -54,36 +56,93 @@ final class GenericDisambiguationTests: XCTestCase {
     )
   }
 
-  func testGenericDisambiguation6() {
+  func testGenericDisambiguation6a() {
     AssertParse(
       """
       _ = a < b
+      """
+    )
+  }
+
+  func testGenericDisambiguation6b() {
+    AssertParse(
+      """
       _ = (a < b, c > d)
-      // Parses as generic because of lparen after '>'
-      (a < b, c > (d)) 
-      // Parses as generic because of lparen after '>'
-      (a<b, c>(d)) 
+      """
+    )
+  }
+
+  func testGenericDisambiguation6c() {
+    // Parses as generic because of lparen after '>'
+    AssertParse(
+      """
+      (a < b, c > (d))
+      """,
+      substructure: Syntax(GenericArgumentListSyntax([
+        GenericArgumentSyntax(
+          argumentType: TypeSyntax(SimpleTypeIdentifierSyntax(
+            name: .identifier("b"),
+            genericArgumentClause: nil
+          )),
+          trailingComma: .commaToken()
+        ),
+        GenericArgumentSyntax(
+          argumentType: TypeSyntax(SimpleTypeIdentifierSyntax(
+            name: .identifier("c"),
+            genericArgumentClause: nil
+          )),
+          trailingComma: nil
+        )
+      ]))
+    )
+  }
+
+  func testGenericDisambiguation6d() {
+    // Parses as generic because of lparen after '>'
+    AssertParse(
+      """
+      (a<b, c>(d))
+      """,
+      substructure: Syntax(GenericArgumentListSyntax([
+        GenericArgumentSyntax(
+          argumentType: TypeSyntax(SimpleTypeIdentifierSyntax(
+            name: .identifier("b"),
+            genericArgumentClause: nil
+          )),
+          trailingComma: .commaToken()
+        ),
+        GenericArgumentSyntax(
+          argumentType: TypeSyntax(SimpleTypeIdentifierSyntax(
+            name: .identifier("c"),
+            genericArgumentClause: nil
+          )),
+          trailingComma: nil
+        )
+      ]))
+    )
+  }
+
+  func testGenericDisambiguation6e() {
+    AssertParse(
+      """
       _ = a>(b)
+      """
+    )
+  }
+
+  func testGenericDisambiguation6f() {
+    AssertParse(
+      """
       _ = a > (b)
-      """,
-      diagnostics: [
-        // TODO: Old parser expected error on line 4: cannot specialize a non-generic definition
-        // TODO: Old parser expected note on line 4: while parsing this '<' as a type parameter bracket
-        // TODO: Old parser expected error on line 6: cannot specialize a non-generic definition
-        // TODO: Old parser expected note on line 6: while parsing this '<' as a type parameter bracket
-      ]
+      """
     )
   }
 
   func testGenericDisambiguation7() {
     AssertParse(
       """
       generic<Int>(0)
-      """,
-      diagnostics: [
-        // TODO: Old parser expected error on line 1: cannot explicitly specialize a generic function
-        // TODO: Old parser expected note on line 1: while parsing this '<' as a type parameter bracket
-      ]
+      """
     )
   }