Merge pull request #944 from ahoppen/ahoppen/review-comments-3

Address review comments from merged PRs

Author: ahoppen

Sources/SwiftParser/Diagnostics/MissingNodesError.swift

@@ -120,8 +120,10 @@ func nodesDescriptionAndCommonParent<SyntaxType: SyntaxProtocol>(_ nodes: [Synta
     return (nil, "syntax")
   case 1:
     return (nil, "\(partDescriptions.first!)")
+  case 2:
+    return (nil, "\(partDescriptions.first!) and \(partDescriptions.last!)")
   default:
-    return (nil, "\(partDescriptions[0..<partDescriptions.count - 1].joined(separator: ", ")) and \(partDescriptions.last!)")
+    return (nil, "\(partDescriptions[0..<partDescriptions.count - 1].joined(separator: ", ")), and \(partDescriptions.last!)")
   }
 }
 

Sources/SwiftParser/Diagnostics/ParserDiagnosticMessages.swift

@@ -77,7 +77,7 @@ public enum StaticParserError: String, DiagnosticMessage {
   case expectedExpressionAfterTry = "expected expression after 'try'"
   case invalidFlagAfterPrecedenceGroupAssignment = "expected 'true' or 'false' after 'assignment'"
   case missingColonInTernaryExprDiagnostic = "expected ':' after '? ...' in ternary expression"
-  case operatorShouldBeDeclaredWithoutBody = "operator should no longer be declared with body"
+  case operatorShouldBeDeclaredWithoutBody = "operator should not be declared with body"
   case standaloneSemicolonStatement = "standalone ';' statements are not allowed"
   case subscriptsCannotHaveNames = "subscripts cannot have a name"
   case throwsInReturnPosition = "'throws' may only occur before '->'"

Tests/SwiftParserTest/Statements.swift

@@ -45,7 +45,7 @@ final class StatementTests: XCTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected expression, '=' and expression in pattern matching"),
+        DiagnosticSpec(message: "expected expression, '=', and expression in pattern matching"),
         DiagnosticSpec(message: "unexpected code '* ! = x' in 'if' statement"),
       ]
     )

Tests/SwiftParserTest/translated/DiagnoseDynamicReplacementTests.swift

@@ -21,7 +21,7 @@ final class DiagnoseDynamicReplacementTests: XCTestCase {
       """,
       diagnostics: [
         // TODO: Old parser expected error on line 1: expected '(' in '_dynamicReplacement' attribute
-        DiagnosticSpec(message: "expected '(', attribute argument and ')' in attribute"),
+        DiagnosticSpec(message: "expected '(', attribute argument, and ')' in attribute"),
       ]
     )
   }

Tests/SwiftParserTest/translated/OperatorDeclTests.swift

@@ -9,7 +9,7 @@ final class OperatorDeclTests: XCTestCase {
       prefix operator +++ 1️⃣{}
       """,
       diagnostics: [
-        DiagnosticSpec(message: "operator should no longer be declared with body", fixIts: ["remove operator body"])
+        DiagnosticSpec(message: "operator should not be declared with body", fixIts: ["remove operator body"])
       ], fixedSource: "prefix operator +++"
     )
   }
@@ -20,7 +20,7 @@ final class OperatorDeclTests: XCTestCase {
       postfix operator +++ 1️⃣{}
       """,
       diagnostics: [
-        DiagnosticSpec(message: "operator should no longer be declared with body")
+        DiagnosticSpec(message: "operator should not be declared with body")
       ]
     )
   }
@@ -31,7 +31,7 @@ final class OperatorDeclTests: XCTestCase {
       infix operator +++ 1️⃣{}
       """,
       diagnostics: [
-        DiagnosticSpec(message: "operator should no longer be declared with body")
+        DiagnosticSpec(message: "operator should not be declared with body")
       ]
     )
   }
@@ -44,7 +44,7 @@ final class OperatorDeclTests: XCTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(message: "operator should no longer be declared with body", fixIts: ["remove operator body"])
+        DiagnosticSpec(message: "operator should not be declared with body", fixIts: ["remove operator body"])
       ], fixedSource: """
       infix operator +++*
       """
@@ -57,7 +57,7 @@ final class OperatorDeclTests: XCTestCase {
       infix operator +++*+ : A 1️⃣{ }
       """,
       diagnostics: [
-        DiagnosticSpec(message: "operator should no longer be declared with body")
+        DiagnosticSpec(message: "operator should not be declared with body")
       ]
     )
   }
@@ -69,7 +69,7 @@ final class OperatorDeclTests: XCTestCase {
       prefix operator +++** : A 1️⃣{ }
       """,
       diagnostics: [
-        DiagnosticSpec(message: "operator should no longer be declared with body")
+        DiagnosticSpec(message: "operator should not be declared with body")
       ]
     )
   }
@@ -88,7 +88,7 @@ final class OperatorDeclTests: XCTestCase {
       postfix operator ++*+* : A 1️⃣{ }
       """,
       diagnostics: [
-        DiagnosticSpec(message: "operator should no longer be declared with body")
+        DiagnosticSpec(message: "operator should not be declared with body")
       ]
     )
   }
@@ -119,7 +119,7 @@ final class OperatorDeclTests: XCTestCase {
       """,
       diagnostics: [
         // TODO: Old parser expected error on line 1: operator must be declared as 'prefix', 'postfix', or 'infix'
-        DiagnosticSpec(message: "operator should no longer be declared with body")
+        DiagnosticSpec(message: "operator should not be declared with body")
       ]
     )
   }
@@ -131,7 +131,7 @@ final class OperatorDeclTests: XCTestCase {
       """,
       diagnostics: [
         // TODO: Old parser expected error on line 1: operator must be declared as 'prefix', 'postfix', or 'infix'
-        DiagnosticSpec(message: "operator should no longer be declared with body")
+        DiagnosticSpec(message: "operator should not be declared with body")
       ]
     )
   }

Tests/SwiftParserTest/translated/ToplevelLibraryTests.swift

@@ -31,7 +31,7 @@ final class ToplevelLibraryTests: XCTestCase {
       for i1️⃣
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected 'in', expression and body in 'for' statement"),
+        DiagnosticSpec(message: "expected 'in', expression, and body in 'for' statement"),
       ]
     )
   }