Add diagnostic for empty switch cases

Author: kimdv

Sources/SwiftParser/Expressions.swift

@@ -2222,8 +2222,9 @@ extension Parser {
   ) -> RawSwitchExprSyntax {
     let (unexpectedBeforeSwitchKeyword, switchKeyword) = self.eat(switchHandle)
 
+    // if there is no expression, like `switch { default: return false }` then left brace will be parsed as
+    // an `RawClosureExprSyntax`.
     let subject: RawExprSyntax
-
     if self.at(.leftBrace) {
       subject = RawExprSyntax(RawMissingExprSyntax(arena: self.arena))
     } else {

Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift

@@ -1034,6 +1034,10 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
       addDiagnostic(node.expression, .missingExpressionInSwitchStatement, handledNodes: [node.expression.id])
     }
 
+    if node.cases.isEmpty && !node.leftBrace.isMissingAllTokens && !node.rightBrace.isMissingAllTokens {
+      addDiagnostic(node.cases, .emptySwitchExprBody, handledNodes: [node.cases.id])
+    }
+
     return .visitChildren
   }
 

Sources/SwiftParserDiagnostics/ParserDiagnosticMessages.swift

@@ -122,6 +122,9 @@ extension DiagnosticMessage where Self == StaticParserError {
   public static var editorPlaceholderInSourceFile: Self {
     .init("editor placeholder in source file")
   }
+  public static var emptySwitchExprBody: Self {
+    .init("'switch' statement body must have at least one 'case' or 'default' block")
+  }
   public static var escapedNewlineAtLatlineOfMultiLineStringLiteralNotAllowed: Self {
     .init("escaped newline at the last line of a multi-line string literal is not allowed")
   }

Tests/SwiftParserTest/ExpressionTests.swift

@@ -1645,11 +1645,14 @@ final class StatementExpressionTests: XCTestCase {
   func testStandaloneAtCaseInSwitch() {
     AssertParse(
       """
-      switch x {
-        1️⃣@case
+      switch x {1️⃣
+        2️⃣@case
       }
       """,
-      diagnostics: [DiagnosticSpec(message: "unexpected code '@case' in 'switch' statement")]
+      diagnostics: [
+        DiagnosticSpec(locationMarker: "1️⃣", message: "'switch' statement body must have at least one 'case' or 'default' block"),
+        DiagnosticSpec(locationMarker: "2️⃣", message: "unexpected code '@case' in 'switch' statement"),
+      ]
     )
   }
 

Tests/SwiftParserTest/translated/RecoveryTests.swift

@@ -613,20 +613,20 @@ final class RecoveryTests: XCTestCase {
       switch1️⃣
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected expression and '{}' to end 'switch' statement")
+        DiagnosticSpec(locationMarker: "1️⃣", message: "expected expression and '{}' to end 'switch' statement")
       ]
     )
   }
 
   func testRecovery46() {
     AssertParse(
       """
-      switch 1️⃣{
+      switch 1️⃣{2️⃣
       }
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected expression in 'switch' statement")
-        // TODO: Old parser expected error on line 1: 'switch' statement body must have at least one 'case' or 'default' block
+        DiagnosticSpec(locationMarker: "1️⃣", message: "expected expression in 'switch' statement"),
+        DiagnosticSpec(locationMarker: "2️⃣", message: "'switch' statement body must have at least one 'case' or 'default' block"),
       ]
     )
   }
@@ -635,12 +635,12 @@ final class RecoveryTests: XCTestCase {
     AssertParse(
       """
       switch 1️⃣
-      {
+      {2️⃣
       }
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected expression in 'switch' statement")
-        // TODO: Old parser expected error on line 1: 'switch' statement body must have at least one 'case' or 'default' block
+        DiagnosticSpec(locationMarker: "1️⃣", message: "expected expression in 'switch' statement"),
+        DiagnosticSpec(locationMarker: "2️⃣", message: "'switch' statement body must have at least one 'case' or 'default' block"),
       ]
     )
   }
@@ -667,36 +667,39 @@ final class RecoveryTests: XCTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "expected expression in 'switch' statement"),
+        DiagnosticSpec(locationMarker: "1️⃣", message: "expected expression in 'switch' statement")
         // TODO: Old parser expected error on line 2: 'is' keyword required to pattern match against type name, Fix-It replacements: 10 - 10 = 'is '
-        DiagnosticSpec(locationMarker: "2️⃣", message: "'case' can only appear inside a 'switch' statement or 'enum' declaration"),
-        DiagnosticSpec(locationMarker: "3️⃣", message: "'case' can only appear inside a 'switch' statement or 'enum' declaration"),
       ]
     )
   }
 
   func testRecovery50() {
     AssertParse(
       """
-      switch 1️⃣{ 42 } {
-        case _: return
+      switch 1️⃣{ 2️⃣42 } {
+        3️⃣case _: return
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "expected expression in 'switch' statement")
+        DiagnosticSpec(locationMarker: "1️⃣", message: "expected expression in 'switch' statement"),
+        DiagnosticSpec(locationMarker: "2️⃣", message: "all statements inside a switch must be covered by a 'case' or 'default' label"),
+        DiagnosticSpec(locationMarker: "3️⃣", message: "'case' can only appear inside a 'switch' statement or 'enum' declaration"),
       ]
     )
   }
 
   func testRecovery51() {
     AssertParse(
       """
-      switch 1️⃣{ 42 }() {
-        case _: return
+      switch 1️⃣{ 2️⃣42 }()3️⃣ {
+        4️⃣case _: return
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "expected expression in 'switch' statement")
+        DiagnosticSpec(locationMarker: "1️⃣", message: "expected expression in 'switch' statement"),
+        DiagnosticSpec(locationMarker: "2️⃣", message: "all statements inside a switch must be covered by a 'case' or 'default' label"),
+        DiagnosticSpec(locationMarker: "3️⃣", message: "consecutive statements on a line must be separated by ';'"),
+        DiagnosticSpec(locationMarker: "4️⃣", message: "'case' can only appear inside a 'switch' statement or 'enum' declaration"),
       ]
     )
   }