cleanup

Author: rintaro

CodeGeneration/Sources/SyntaxSupport/CommonNodes.swift

@@ -409,6 +409,7 @@ public let COMMON_NODES: [Node] = [
     children: [
       Child(
         name: "unexpectedCode",
+        // NOTE: This is not .collection() on purpose. We don't need collection related functions for this.
         kind: .node(kind: .unexpectedNodes)
       )
     ]

CodeGeneration/Sources/generate-swift-syntax/templates/swiftparser/LayoutNodesParsableFile.swift

@@ -68,7 +68,7 @@ let layoutNodesParsableFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
     DeclSyntax(
       """
       mutating func parseNonOptionalCodeBlockItem() -> RawCodeBlockItemSyntax {
-        guard let node = self.self.parseCodeBlockItem(allowInitDecl: true, until: { _ in false }) else {
+        guard let node = self.parseCodeBlockItem(allowInitDecl: true, until: { _ in false }) else {
           // The missing item is not necessary to be a declaration,
           // which is just a placeholder here
           return RawCodeBlockItemSyntax(

CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift

@@ -641,7 +641,12 @@ class ValidateSyntaxNodes: XCTestCase {
 
     assertFailuresMatchXFails(
       failures,
-      expectedFailures: []
+      expectedFailures: [
+        ValidationFailure(
+          node: .unexpectedCodeDecl,
+          message: "child 'unexpectedCode' is a SyntaxCollection but child is not marked as a collection"
+        ),
+      ]
     )
   }
 

Sources/SwiftParser/Attributes.swift

@@ -33,9 +33,7 @@ extension Parser {
       //
       // In such cases, the second `#if` is not `consumeIfConfigOfAttributes()`.
       return .ifConfigDecl(
-        self.parsePoundIfDirective { parser in
-          return .attributes(parser.parseAttributeList())
-        }
+        self.parsePoundIfDirective({ .attributes($0.parseAttributeList()) })
       )
     } else {
       return .attribute(self.parseAttribute())
@@ -896,6 +894,8 @@ extension Parser {
 
     let decl: RawDeclSyntax
     if self.at(.poundIf) {
+      // '#if' is not accepted in '@abi' attribute, but for recovery, parse it
+      // parse it and wrap the first decl init with unexpected nodes.
       let ifConfig = self.parsePoundIfDirective({ parser in
         let decl = parser.parseDeclaration(in: .argumentList)
         let member = RawMemberBlockItemSyntax(decl: decl, semicolon: nil, arena: parser.arena)

Sources/SwiftParser/Declarations.swift

@@ -52,6 +52,16 @@ extension TokenConsumer {
     }
   }
 
+  /// Check if the current token is at a start of any declaration.
+  ///
+  ///
+  /// - Parameters
+  ///   - allowInitDecl: whether to consider 'init' a declaration in the context.
+  ///     Only initializer bodies should use `false` for this.
+  ///   - requiresDecl: Whether only declarations are expected in the context.
+  ///     For example, in member blocks.
+  ///
+  /// - Note: this returns `false` for `#if` unless it's an attribute list.
   mutating func atStartOfDeclaration(
     allowInitDecl: Bool = true,
     requiresDecl: Bool = false
@@ -111,7 +121,7 @@ extension TokenConsumer {
       var lookahead = subparser.lookahead()
       repeat {
         lookahead.consumeAnyToken()
-      } while lookahead.atStartOfDeclaration(allowInitDecl: allowInitDecl)
+      } while lookahead.atStartOfDeclaration(allowInitDecl: allowInitDecl, requiresDecl: requiresDecl)
       return lookahead.at(.identifier)
     case .lhs(.case):
       // When 'case' appears inside a function, it's probably a switch
@@ -179,7 +189,7 @@ extension TokenConsumer {
           return true
         }
       }
-      // Special recovery 'try let/var'.
+      // Special recovery for 'try let/var'.
       if subparser.at(.keyword(.try)),
         subparser.peek(isAtAnyIn: VariableDeclSyntax.BindingSpecifierOptions.self) != nil
       {
@@ -199,10 +209,6 @@ extension Parser {
       self.attributes = attributes
       self.modifiers = modifiers
     }
-
-    var isEmpty: Bool {
-      attributes.isEmpty && modifiers.isEmpty
-    }
   }
 
   /// Describes the context around a declaration in order to modify how it is parsed.
@@ -1010,7 +1016,7 @@ extension Parser {
     var elements = [RawMemberBlockItemSyntax]()
     do {
       var loopProgress = LoopProgressCondition()
-      while !self.at(.endOfFile) && !stopCondition(&self) && self.hasProgressed(&loopProgress) {
+      while !stopCondition(&self), !self.at(.endOfFile), self.hasProgressed(&loopProgress) {
         let newItemAtStartOfLine = self.atStartOfLine
         guard let newElement = self.parseMemberBlockItem(until: stopCondition) else {
           break

Sources/SwiftParser/Directives.swift

@@ -180,33 +180,6 @@ extension Parser {
     // `#elif` or `#elif(…)` could be macro invocations.
     return lookahead.at(TokenSpec(.identifier, allowAtStartOfLine: false))
   }
-
-  private mutating func parseIfConfigClauseElements<Element: RawSyntaxNodeProtocol>(
-    _ parseElement: (_ parser: inout Parser, _ isFirstElement: Bool) -> Element?,
-    addSemicolonIfNeeded: (
-      _ lastElement: Element, _ newItemAtStartOfLine: Bool, _ newItem: Element, _ parser: inout Parser
-    ) -> Element?
-  ) -> [Element] {
-    var elements = [Element]()
-    var elementsProgress = LoopProgressCondition()
-    while !self.at(.endOfFile)
-      && !self.at(.poundElse, .poundElseif, .poundEndif)
-      && !self.atElifTypo()
-      && self.hasProgressed(&elementsProgress)
-    {
-      let newItemAtStartOfLine = self.atStartOfLine
-      guard let element = parseElement(&self, elements.isEmpty), !element.isEmpty else {
-        break
-      }
-      if let lastElement = elements.last,
-        let fixedUpLastItem = addSemicolonIfNeeded(lastElement, newItemAtStartOfLine, element, &self)
-      {
-        elements[elements.count - 1] = fixedUpLastItem
-      }
-      elements.append(element)
-    }
-    return elements
-  }
 }
 
 extension Parser {

Sources/SwiftParser/Expressions.swift

@@ -2332,7 +2332,7 @@ extension Parser {
     var elements = [RawSwitchCaseListSyntax.Element]()
     var elementsProgress = LoopProgressCondition()
     while !self.at(.endOfFile, .rightBrace), !self.atEndOfIfConfigClauseBody(), self.hasProgressed(&elementsProgress) {
-      if self.withLookahead({ $0.atStartOfSwitchCase(allowRecovery: false) }) {
+      if self.withLookahead({ $0.atStartOfSwitchCase() }) {
         elements.append(.switchCase(self.parseSwitchCase()))
       } else if self.canRecoverTo(.poundIf) != nil {
         // '#if' in 'case' position can enclose zero or more 'case' or 'default'
@@ -2392,13 +2392,6 @@ extension Parser {
       if $0.at(.rightBrace, .keyword(.case), .keyword(.default)) || $0.atEndOfIfConfigClauseBody() {
         return true
       }
-      if $0.at(.atSign),
-        $0.withLookahead({
-          $0.consumeAnyAttribute(); return $0.at(.keyword(.case), .keyword(.default))
-        })
-      {
-        return true
-      }
       if $0.withLookahead({ $0.atStartOfConditionalSwitchCases() }) {
         return true
       }

Sources/SwiftParser/Statements.swift

@@ -1077,7 +1077,7 @@ extension Parser.Lookahead {
 
   /// Returns whether the parser's current position is the start of a switch case,
   /// given that we're in the middle of a switch already.
-  mutating func atStartOfSwitchCase(allowRecovery: Bool = false) -> Bool {
+  mutating func atStartOfSwitchCase() -> Bool {
     // Check for and consume attributes. The only valid attribute is `@unknown`
     // but that's a semantic restriction.
     var lookahead = self.lookahead()
@@ -1092,11 +1092,7 @@ extension Parser.Lookahead {
       return true
     }
 
-    if allowRecovery {
-      return lookahead.canRecoverTo(anyIn: SwitchCaseStart.self) != nil
-    } else {
-      return lookahead.at(anyIn: SwitchCaseStart.self) != nil
-    }
+    return lookahead.at(anyIn: SwitchCaseStart.self) != nil
   }
 
   mutating func atStartOfConditionalSwitchCases() -> Bool {