Merge pull request #1048 from rintaro/remove-rawsyntax-modifiers

Remove XXXRawSyntax.withYYY() methods

Author: rintaro

Sources/SwiftParser/Declarations.swift

@@ -167,7 +167,13 @@ extension Parser {
           arena: parser.arena)
       } addSemicolonIfNeeded: { lastElement, newItemAtStartOfLine, parser in
         if lastElement.semicolon == nil && !newItemAtStartOfLine {
-          return lastElement.withSemicolon(parser.missingToken(.semicolon, text: nil), arena: parser.arena)
+          return RawMemberDeclListItemSyntax(
+            lastElement.unexpectedBeforeDecl,
+            decl: lastElement.decl,
+            lastElement.unexpectedBetweenDeclAndSemicolon,
+            semicolon: parser.missingToken(.semicolon, text: nil),
+            lastElement.unexpectedAfterSemicolon,
+            arena: parser.arena)
         } else {
           return nil
         }
@@ -681,7 +687,14 @@ extension Parser {
           break
         }
         if let lastItem = elements.last, lastItem.semicolon == nil && !newItemAtStartOfLine {
-          elements[elements.count - 1] = lastItem.withSemicolon(missingToken(.semicolon, text: nil), arena: self.arena)
+          elements[elements.count - 1] = RawMemberDeclListItemSyntax(
+            lastItem.unexpectedBeforeDecl,
+            decl: lastItem.decl,
+            lastItem.unexpectedBetweenDeclAndSemicolon,
+            semicolon: self.missingToken(.semicolon, text: nil),
+            lastItem.unexpectedAfterSemicolon,
+            arena: self.arena)
+
         }
         elements.append(newElement)
       }

Sources/SwiftParser/TopLevel.swift

@@ -68,7 +68,15 @@ extension Parser {
         break
       }
       if let lastItem = elements.last, lastItem.semicolon == nil && !newItemAtStartOfLine {
-        elements[elements.count - 1] = lastItem.withSemicolon(missingToken(.semicolon, text: nil), arena: self.arena)
+        elements[elements.count - 1] = RawCodeBlockItemSyntax(
+          lastItem.unexpectedBeforeItem,
+          item: .init(lastItem.item)!,
+          lastItem.unexpectedBetweenItemAndSemicolon,
+          semicolon: self.missingToken(.semicolon, text: nil),
+          lastItem.unexpectedBetweenSemicolonAndErrorTokens,
+          errorTokens: lastItem.errorTokens,
+          lastItem.unexpectedAfterErrorTokens,
+          arena: self.arena)
       }
       elements.append(newElement)
     }
@@ -195,7 +203,15 @@ extension Parser {
         $0.parseCodeBlockItem()
       } addSemicolonIfNeeded: { lastElement, newItemAtStartOfLine, parser in
         if lastElement.semicolon == nil && !newItemAtStartOfLine {
-          return lastElement.withSemicolon(parser.missingToken(.semicolon, text: nil), arena: parser.arena)
+          return RawCodeBlockItemSyntax(
+            lastElement.unexpectedBeforeItem,
+            item: .init(lastElement.item)!,
+            lastElement.unexpectedBetweenItemAndSemicolon,
+            semicolon: parser.missingToken(.semicolon, text: nil),
+            lastElement.unexpectedBetweenSemicolonAndErrorTokens,
+            errorTokens: lastElement.errorTokens,
+            lastElement.unexpectedAfterErrorTokens,
+            arena: parser.arena)
         } else {
           return nil
         }

Sources/SwiftSyntax/Raw/RawSyntaxNodes.swift.gyb

@@ -157,13 +157,6 @@ public struct Raw${node.name}: Raw${node.name if node.is_base() else node.base_t
     layoutView.children[${idx}]${iuo_mark}
 %       else:
     layoutView.children[${idx}].map(Raw${child.type_name}.init(raw:))${iuo_mark}
-%       end
-  }
-  public func with${child.name}(_ ${child.swift_name}: Raw${child.type_name + optional_mark}, arena: SyntaxArena) -> Raw${node.name} {
-%       if child.is_optional:
-    return layoutView.replacingChild(at: ${idx}, with: ${child.swift_name}.map(RawSyntax.init), arena: arena).as(Raw${node.name}.self)!
-%       else:
-    return layoutView.replacingChild(at: ${idx}, with: RawSyntax(${child.swift_name}), arena: arena).as(Raw${node.name}.self)!
 %       end
   }
 %     end