Merge pull request #69325 from hamishknight/rm-rf

Author: hamishknight

lib/ASTGen/.swift-format

@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "lineLength": 120,
+    "indentation": {
+        "spaces": 2
+    },
+    "lineBreakBeforeEachArgument": true,
+    "indentConditionalCompilationBlocks": false,
+    "rules": {
+        "AlwaysUseLowerCamelCase": false,
+        "AmbiguousTrailingClosureOverload": false,
+        "NoBlockComments": false,
+        "OrderedImports": true,
+        "UseLetInEveryBoundCaseVariable": false,
+        "UseSynthesizedInitializer": false
+    }
+}

lib/ASTGen/Package.swift

@@ -42,7 +42,7 @@ let package = Package(
         .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
         .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
         .product(name: "SwiftSyntaxMacroExpansion", package: "swift-syntax"),
-        "swiftLLVMJSON"
+        "swiftLLVMJSON",
       ],
       path: "Sources/ASTGen",
       swiftSettings: swiftSetttings

lib/ASTGen/Sources/ASTGen/ASTGen.swift

@@ -1,9 +1,8 @@
 import CASTBridging
 import CBasicBridging
-
 // Needed to use BumpPtrAllocator
-@_spi(BumpPtrAllocator)
-import SwiftSyntax
+@_spi(BumpPtrAllocator) import SwiftSyntax
+
 import struct SwiftDiagnostics.Diagnostic
 
 extension UnsafePointer {
@@ -107,13 +106,19 @@ struct ASTGenVisitor {
         out.append(d.raw)
       case .stmt(let s):
         let topLevelDecl = BridgedTopLevelCodeDecl.createParsed(
-          self.ctx, declContext: self.declContext, startLoc: loc, stmt: s, 
+          self.ctx,
+          declContext: self.declContext,
+          startLoc: loc,
+          stmt: s,
           endLoc: loc
         )
         out.append(topLevelDecl.raw)
       case .expr(let e):
         let topLevelDecl = BridgedTopLevelCodeDecl.createParsed(
-          self.ctx, declContext: self.declContext, startLoc: loc, expr: e,
+          self.ctx,
+          declContext: self.declContext,
+          startLoc: loc,
+          expr: e,
           endLoc: loc
         )
         out.append(topLevelDecl.raw)
@@ -174,7 +179,7 @@ extension ASTGenVisitor {
   func generate(_ node: some SyntaxChildChoices) -> ASTNode {
     return self.generate(Syntax(node))
   }
-    
+
   func generate(_ node: Syntax) -> ASTNode {
     switch node.as(SyntaxEnum.self) {
     case .actorDecl(let node):

lib/ASTGen/Sources/ASTGen/Bridge.swift

@@ -90,7 +90,7 @@ extension Optional where Wrapped: SyntaxProtocol {
     guard let self else {
       return nil
     }
-    
+
     return self.bridgedSourceLoc(in: astgen)
   }
 }

lib/ASTGen/Sources/ASTGen/Decls.swift

@@ -1,8 +1,6 @@
 import CASTBridging
-
-@_spi(ExperimentalLanguageFeatures)
-import SwiftSyntax
 import SwiftDiagnostics
+@_spi(ExperimentalLanguageFeatures) import SwiftSyntax
 
 // MARK: - TypeDecl
 
@@ -37,7 +35,7 @@ extension ASTGenVisitor {
       genericWhereClause: self.generate(node.genericWhereClause),
       braceRange: BridgedSourceRange(
         startToken: node.memberBlock.leftBrace,
-        endToken: node.memberBlock.rightBrace, 
+        endToken: node.memberBlock.rightBrace,
         in: self
       )
     )
@@ -63,7 +61,7 @@ extension ASTGenVisitor {
       genericWhereClause: self.generate(node.genericWhereClause),
       braceRange: BridgedSourceRange(
         startToken: node.memberBlock.leftBrace,
-        endToken: node.memberBlock.rightBrace, 
+        endToken: node.memberBlock.rightBrace,
         in: self
       )
     )
@@ -339,14 +337,17 @@ extension BridgedOperatorFixity {
 extension ASTGenVisitor {
   func generate(_ node: OperatorDeclSyntax) -> BridgedOperatorDecl {
     let (name, nameLoc) = node.name.bridgedIdentifierAndSourceLoc(in: self)
-    let (precedenceGroupName, precedenceGroupLoc) = (node.operatorPrecedenceAndTypes?.precedenceGroup).bridgedIdentifierAndSourceLoc(in: self)
+    let (precedenceGroupName, precedenceGroupLoc) = (node.operatorPrecedenceAndTypes?.precedenceGroup)
+      .bridgedIdentifierAndSourceLoc(in: self)
 
     let fixity: BridgedOperatorFixity
     if let value = BridgedOperatorFixity(from: node.fixitySpecifier.tokenKind) {
       fixity = value
     } else {
       fixity = .infix
-      self.diagnose(Diagnostic(node: node.fixitySpecifier, message: UnexpectedTokenKindError(token: node.fixitySpecifier)))
+      self.diagnose(
+        Diagnostic(node: node.fixitySpecifier, message: UnexpectedTokenKindError(token: node.fixitySpecifier))
+      )
     }
 
     return .createParsed(
@@ -388,7 +389,9 @@ extension ASTGenVisitor {
     }
 
     func diagnoseDuplicateSyntax(_ duplicate: some SyntaxProtocol, original: some SyntaxProtocol) {
-      self.diagnose(Diagnostic(node: duplicate, message: DuplicateSyntaxError(duplicate: duplicate, original: original)))
+      self.diagnose(
+        Diagnostic(node: duplicate, message: DuplicateSyntaxError(duplicate: duplicate, original: original))
+      )
     }
 
     let body = node.groupAttributes.reduce(into: PrecedenceGroupBody()) { body, element in

lib/ASTGen/Sources/ASTGen/Diagnostics.swift

@@ -76,7 +76,9 @@ struct DuplicateSyntaxError: ASTGenError {
   init(duplicate: some SyntaxProtocol, original: some SyntaxProtocol) {
     precondition(duplicate.kind == original.kind, "Expected duplicate and original to be of same kind")
 
-    guard let duplicateParent = duplicate.parent, let originalParent = original.parent, duplicateParent == originalParent, duplicateParent.kind.isSyntaxCollection else {
+    guard let duplicateParent = duplicate.parent, let originalParent = original.parent,
+      duplicateParent == originalParent, duplicateParent.kind.isSyntaxCollection
+    else {
       preconditionFailure("Expected a shared syntax collection parent")
     }
 

lib/ASTGen/Sources/ASTGen/DiagnosticsBridge.swift

@@ -52,7 +52,8 @@ fileprivate func emitDiagnosticParts(
     case .replaceLeadingTrivia(let oldToken, let newTrivia):
       replaceStartLoc = bridgedSourceLoc(at: oldToken.position)
       replaceEndLoc = bridgedSourceLoc(
-        at: oldToken.positionAfterSkippingLeadingTrivia)
+        at: oldToken.positionAfterSkippingLeadingTrivia
+      )
       newText = newTrivia.description
 
     case .replaceTrailingTrivia(let oldToken, let newTrivia):
@@ -63,7 +64,8 @@ fileprivate func emitDiagnosticParts(
 
     newText.withBridgedString { bridgedMessage in
       diag.fixItReplace(
-        start: replaceStartLoc, end: replaceEndLoc,
+        start: replaceStartLoc,
+        end: replaceEndLoc,
         replacement: bridgedMessage
       )
     }
@@ -117,11 +119,11 @@ func emitDiagnostic(
 extension DiagnosticSeverity {
   var bridged: BridgedDiagnosticSeverity {
     switch self {
-      case .error: return .error
-      case .note: return .note
-      case .warning: return .warning
-      case .remark: return .remark
-      @unknown default: return .error
+    case .error: return .error
+    case .note: return .note
+    case .warning: return .warning
+    case .remark: return .remark
+    @unknown default: return .error
     }
   }
 }
@@ -186,7 +188,8 @@ extension SourceManager {
       case .replaceTrailingTrivia(let oldToken, let newTrivia):
         replaceStartLoc = bridgedSourceLoc(
           for: oldToken,
-          at: oldToken.endPositionBeforeTrailingTrivia)
+          at: oldToken.endPositionBeforeTrailingTrivia
+        )
         replaceEndLoc = bridgedSourceLoc(
           for: oldToken,
           at: oldToken.endPosition
@@ -196,7 +199,8 @@ extension SourceManager {
 
       newText.withBridgedString { bridgedMessage in
         diag.fixItReplace(
-          start: replaceStartLoc, end: replaceEndLoc,
+          start: replaceStartLoc,
+          end: replaceEndLoc,
           replacement: bridgedMessage
         )
       }
@@ -222,11 +226,11 @@ extension SourceManager {
     // Emit Fix-Its.
     for fixIt in diagnostic.fixIts {
       diagnoseSingle(
-          message: fixIt.message.message,
-          severity: .note,
-          node: diagnostic.node,
-          position: diagnostic.position,
-          fixItChanges: fixIt.changes
+        message: fixIt.message.message,
+        severity: .note,
+        node: diagnostic.node,
+        position: diagnostic.position,
+        fixItChanges: fixIt.changes
       )
     }
 
@@ -315,7 +319,8 @@ public func addQueuedSourceFile(
   // Determine the parent link, for a child buffer.
   let parent: (GroupedDiagnostics.SourceFileID, AbsolutePosition)?
   if parentID >= 0,
-      let parentSourceFileID = queuedDiagnostics.pointee.sourceFileIDs[parentID] {
+    let parentSourceFileID = queuedDiagnostics.pointee.sourceFileIDs[parentID]
+  {
     parent = (parentSourceFileID.pointee, AbsolutePosition(utf8Offset: positionInParent))
   } else {
     parent = nil
@@ -387,17 +392,20 @@ public func addQueuedDiagnostic(
   // Map the highlights.
   var highlights: [Syntax] = []
   let highlightRanges = UnsafeBufferPointer<BridgedSourceLoc>(
-    start: highlightRangesPtr, count: numHighlightRanges * 2
+    start: highlightRangesPtr,
+    count: numHighlightRanges * 2
   )
   for index in 0..<numHighlightRanges {
     // Make sure both the start and the end land within this source file.
     guard let start = highlightRanges[index * 2].raw,
-          let end = highlightRanges[index * 2 + 1].raw  else {
+      let end = highlightRanges[index * 2 + 1].raw
+    else {
       continue
     }
 
     guard start >= sourceFileBaseAddress && start < sourceFileEndAddress,
-          end >= sourceFileBaseAddress && end <= sourceFileEndAddress else {
+      end >= sourceFileBaseAddress && end <= sourceFileEndAddress
+    else {
       continue
     }
 
@@ -414,8 +422,9 @@ public func addQueuedDiagnostic(
     while true {
       // If this syntax matches our starting/ending positions, add the
       // highlight and we're done.
-      if highlightSyntax.positionAfterSkippingLeadingTrivia == startPos &&
-          highlightSyntax.endPositionBeforeTrailingTrivia == endPos {
+      if highlightSyntax.positionAfterSkippingLeadingTrivia == startPos
+        && highlightSyntax.endPositionBeforeTrailingTrivia == endPos
+      {
         highlights.append(highlightSyntax)
         break
       }

lib/ASTGen/Sources/ASTGen/Exprs.swift

@@ -1,6 +1,6 @@
 import CASTBridging
-import SwiftSyntax
 import SwiftDiagnostics
+import SwiftSyntax
 
 extension ASTGenVisitor {
   public func generate(_ node: ClosureExprSyntax) -> BridgedClosureExpr {
@@ -18,10 +18,14 @@ extension ASTGenVisitor {
   public func generate(_ node: FunctionCallExprSyntax) -> BridgedCallExpr {
     if !node.arguments.isEmpty || node.trailingClosure == nil {
       if node.leftParen == nil {
-        self.diagnose(Diagnostic(node: node, message: MissingChildTokenError(parent: node, kindOfTokenMissing: .leftParen)))
+        self.diagnose(
+          Diagnostic(node: node, message: MissingChildTokenError(parent: node, kindOfTokenMissing: .leftParen))
+        )
       }
       if node.rightParen == nil {
-        self.diagnose(Diagnostic(node: node, message: MissingChildTokenError(parent: node, kindOfTokenMissing: .rightParen)))
+        self.diagnose(
+          Diagnostic(node: node, message: MissingChildTokenError(parent: node, kindOfTokenMissing: .rightParen))
+        )
       }
     }
 
@@ -30,14 +34,20 @@ extension ASTGenVisitor {
     // Transform the trailing closure into an argument.
     if let trailingClosure = node.trailingClosure {
       let tupleElement = LabeledExprSyntax(
-        label: nil, colon: nil, expression: ExprSyntax(trailingClosure), trailingComma: nil)
+        label: nil,
+        colon: nil,
+        expression: ExprSyntax(trailingClosure),
+        trailingComma: nil
+      )
 
       node.arguments.append(tupleElement)
       node.trailingClosure = nil
     }
 
     let argumentTuple = self.generate(
-      node.arguments, leftParen: node.leftParen, rightParen: node.rightParen
+      node.arguments,
+      leftParen: node.leftParen,
+      rightParen: node.rightParen
     )
     let callee = generate(node.calledExpression)
 
@@ -69,7 +79,10 @@ extension ASTGenVisitor {
 
     // Wrap in a SingleValueStmtExpr to embed as an expression.
     return .createWithWrappedBranches(
-      ctx, stmt: stmt, declContext: declContext, mustBeExpr: true
+      ctx,
+      stmt: stmt,
+      declContext: declContext,
+      mustBeExpr: true
     )
   }
 
@@ -94,7 +107,7 @@ extension ASTGenVisitor {
 
       return $0.bridgedSourceLoc(in: self)
     }
-    
+
     return BridgedTupleExpr.createParsed(
       self.ctx,
       leftParenLoc: leftParen.bridgedSourceLoc(in: self),