Merge pull request swiftlang#477 from ahoppen/ahoppen/remove-with-functions

Adjustment for removed `with<childName>` functions

Author: ahoppen

Sources/SwiftFormatCore/LegacyTriviaBehavior.swift

@@ -17,15 +17,15 @@ private final class LegacyTriviaBehaviorRewriter: SyntaxRewriter {
   override func visit(_ token: TokenSyntax) -> TokenSyntax {
     var token = token
     if let pendingLeadingTrivia = pendingLeadingTrivia {
-      token = token.withLeadingTrivia(pendingLeadingTrivia + token.leadingTrivia)
+      token = token.with(\.leadingTrivia, pendingLeadingTrivia + token.leadingTrivia)
       self.pendingLeadingTrivia = nil
     }
     if token.nextToken != nil,
       let firstIndexToMove = token.trailingTrivia.firstIndex(where: shouldTriviaPieceBeMoved)
     {
       pendingLeadingTrivia = Trivia(pieces: Array(token.trailingTrivia[firstIndexToMove...]))
       token =
-        token.withTrailingTrivia(Trivia(pieces: Array(token.trailingTrivia[..<firstIndexToMove])))
+        token.with(\.trailingTrivia, Trivia(pieces: Array(token.trailingTrivia[..<firstIndexToMove])))
     }
     return token
   }

Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

@@ -3483,7 +3483,7 @@ class CommentMovingRewriter: SyntaxRewriter {
 
   override func visit(_ token: TokenSyntax) -> TokenSyntax {
     if let rewrittenTrivia = rewriteTokenTriviaMap[token] {
-      return token.withLeadingTrivia(rewrittenTrivia)
+      return token.with(\.leadingTrivia, rewrittenTrivia)
     }
     return token
   }

Sources/SwiftFormatRules/AddModifierRewriter.swift

@@ -33,7 +33,7 @@ fileprivate final class AddModifierRewriter: SyntaxRewriter {
 
     // Put accessor keyword before the first modifier keyword in the declaration
     let newModifiers = modifiers.prepend(modifier: modifierKeyword)
-    return DeclSyntax(node.withModifiers(newModifiers))
+    return DeclSyntax(node.with(\.modifiers, newModifiers))
   }
 
   override func visit(_ node: FunctionDeclSyntax) -> DeclSyntax {
@@ -46,7 +46,7 @@ fileprivate final class AddModifierRewriter: SyntaxRewriter {
     }
     guard modifiers.accessLevelModifier == nil else { return DeclSyntax(node) }
     let newModifiers = modifiers.prepend(modifier: modifierKeyword)
-    return DeclSyntax(node.withModifiers(newModifiers))
+    return DeclSyntax(node.with(\.modifiers, newModifiers))
   }
 
   override func visit(_ node: AssociatedtypeDeclSyntax) -> DeclSyntax {
@@ -59,7 +59,7 @@ fileprivate final class AddModifierRewriter: SyntaxRewriter {
     }
     guard modifiers.accessLevelModifier == nil else { return DeclSyntax(node) }
     let newModifiers = modifiers.prepend(modifier: modifierKeyword)
-    return DeclSyntax(node.withModifiers(newModifiers))
+    return DeclSyntax(node.with(\.modifiers, newModifiers))
   }
 
   override func visit(_ node: ClassDeclSyntax) -> DeclSyntax {
@@ -72,7 +72,7 @@ fileprivate final class AddModifierRewriter: SyntaxRewriter {
     }
     guard modifiers.accessLevelModifier == nil else { return DeclSyntax(node) }
     let newModifiers = modifiers.prepend(modifier: modifierKeyword)
-    return DeclSyntax(node.withModifiers(newModifiers))
+    return DeclSyntax(node.with(\.modifiers, newModifiers))
   }
 
   override func visit(_ node: EnumDeclSyntax) -> DeclSyntax {
@@ -85,7 +85,7 @@ fileprivate final class AddModifierRewriter: SyntaxRewriter {
     }
     guard modifiers.accessLevelModifier == nil else { return DeclSyntax(node) }
     let newModifiers = modifiers.prepend(modifier: modifierKeyword)
-    return DeclSyntax(node.withModifiers(newModifiers))
+    return DeclSyntax(node.with(\.modifiers, newModifiers))
   }
 
   override func visit(_ node: ProtocolDeclSyntax) -> DeclSyntax {
@@ -98,7 +98,7 @@ fileprivate final class AddModifierRewriter: SyntaxRewriter {
     }
     guard modifiers.accessLevelModifier == nil else { return DeclSyntax(node) }
     let newModifiers = modifiers.prepend(modifier: modifierKeyword)
-    return DeclSyntax(node.withModifiers(newModifiers))
+    return DeclSyntax(node.with(\.modifiers, newModifiers))
   }
 
   override func visit(_ node: StructDeclSyntax) -> DeclSyntax {
@@ -111,7 +111,7 @@ fileprivate final class AddModifierRewriter: SyntaxRewriter {
     }
     guard modifiers.accessLevelModifier == nil else { return DeclSyntax(node) }
     let newModifiers = modifiers.prepend(modifier: modifierKeyword)
-    return DeclSyntax(node.withModifiers(newModifiers))
+    return DeclSyntax(node.with(\.modifiers, newModifiers))
   }
 
   override func visit(_ node: TypealiasDeclSyntax) -> DeclSyntax {
@@ -124,7 +124,7 @@ fileprivate final class AddModifierRewriter: SyntaxRewriter {
     }
     guard modifiers.accessLevelModifier == nil else { return DeclSyntax(node) }
     let newModifiers = modifiers.prepend(modifier: modifierKeyword)
-    return DeclSyntax(node.withModifiers(newModifiers))
+    return DeclSyntax(node.with(\.modifiers, newModifiers))
   }
 
   override func visit(_ node: InitializerDeclSyntax) -> DeclSyntax {
@@ -137,7 +137,7 @@ fileprivate final class AddModifierRewriter: SyntaxRewriter {
     }
     guard modifiers.accessLevelModifier == nil else { return DeclSyntax(node) }
     let newModifiers = modifiers.prepend(modifier: modifierKeyword)
-    return DeclSyntax(node.withModifiers(newModifiers))
+    return DeclSyntax(node.with(\.modifiers, newModifiers))
   }
 
   override func visit(_ node: SubscriptDeclSyntax) -> DeclSyntax {
@@ -150,7 +150,7 @@ fileprivate final class AddModifierRewriter: SyntaxRewriter {
     }
     guard modifiers.accessLevelModifier == nil else { return DeclSyntax(node) }
     let newModifiers = modifiers.prepend(modifier: modifierKeyword)
-    return DeclSyntax(node.withModifiers(newModifiers))
+    return DeclSyntax(node.with(\.modifiers, newModifiers))
   }
 
   /// Moves trivia in the given node to correct the placement of potentially displaced trivia in the

Sources/SwiftFormatRules/DoNotUseSemicolons.swift

@@ -87,7 +87,7 @@ public final class DoNotUseSemicolons: SyntaxFormatRule {
 
         // This discards any trailingTrivia from the semicolon. That trivia is at most some spaces,
         // and the pretty printer adds any necessary spaces so it's safe to discard.
-        newItem = newItem.withSemicolon(nil)
+        newItem = newItem.with(\.semicolon, nil)
         if idx < node.count - 1 {
           diagnose(.removeSemicolonAndMove, on: semicolon)
         } else {

Sources/SwiftFormatRules/FileScopedDeclarationPrivacy.swift

@@ -24,7 +24,7 @@ import SwiftSyntax
 public final class FileScopedDeclarationPrivacy: SyntaxFormatRule {
   public override func visit(_ node: SourceFileSyntax) -> SourceFileSyntax {
     let newStatements = rewrittenCodeBlockItems(node.statements)
-    return node.withStatements(newStatements)
+    return node.with(\.statements, newStatements)
   }
 
   /// Returns a list of code block items equivalent to the given list, but where any file-scoped
@@ -40,7 +40,7 @@ public final class FileScopedDeclarationPrivacy: SyntaxFormatRule {
     let newCodeBlockItems = codeBlockItems.map { codeBlockItem -> CodeBlockItemSyntax in
       switch codeBlockItem.item {
       case .decl(let decl):
-        return codeBlockItem.withItem(.decl(rewrittenDecl(decl)))
+        return codeBlockItem.with(\.item, .decl(rewrittenDecl(decl)))
       default:
         return codeBlockItem
       }
@@ -59,43 +59,43 @@ public final class FileScopedDeclarationPrivacy: SyntaxFormatRule {
       return DeclSyntax(rewrittenDecl(
           functionDecl,
           modifiers: functionDecl.modifiers,
-          factory: functionDecl.withModifiers))
+          factory: { functionDecl.with(\.modifiers, $0) }))
 
     case .variableDecl(let variableDecl):
       return DeclSyntax(rewrittenDecl(
           variableDecl,
           modifiers: variableDecl.modifiers,
-          factory: variableDecl.withModifiers))
+          factory: { variableDecl.with(\.modifiers, $0) }))
 
     case .classDecl(let classDecl):
       return DeclSyntax(rewrittenDecl(
           classDecl,
           modifiers: classDecl.modifiers,
-          factory: classDecl.withModifiers))
+          factory: { classDecl.with(\.modifiers, $0) }))
 
     case .structDecl(let structDecl):
       return DeclSyntax(rewrittenDecl(
           structDecl,
           modifiers: structDecl.modifiers,
-          factory: structDecl.withModifiers))
+          factory: { structDecl.with(\.modifiers, $0) }))
 
     case .enumDecl(let enumDecl):
       return DeclSyntax(rewrittenDecl(
           enumDecl,
           modifiers: enumDecl.modifiers,
-          factory: enumDecl.withModifiers))
+          factory: { enumDecl.with(\.modifiers, $0) }))
 
     case .protocolDecl(let protocolDecl):
       return DeclSyntax(rewrittenDecl(
           protocolDecl,
           modifiers: protocolDecl.modifiers,
-          factory: protocolDecl.withModifiers))
+          factory: { protocolDecl.with(\.modifiers, $0) }))
 
     case .typealiasDecl(let typealiasDecl):
       return DeclSyntax(rewrittenDecl(
           typealiasDecl,
           modifiers: typealiasDecl.modifiers,
-          factory: typealiasDecl.withModifiers))
+          factory: { typealiasDecl.with(\.modifiers, $0) }))
 
     default:
       return decl
@@ -113,12 +113,12 @@ public final class FileScopedDeclarationPrivacy: SyntaxFormatRule {
     let newClauses = ifConfigDecl.clauses.map { clause -> IfConfigClauseSyntax in
       switch clause.elements {
       case .statements(let codeBlockItemList)?:
-        return clause.withElements(.statements(rewrittenCodeBlockItems(codeBlockItemList)))
+        return clause.with(\.elements, .statements(rewrittenCodeBlockItems(codeBlockItemList)))
       default:
         return clause
       }
     }
-    return ifConfigDecl.withClauses(IfConfigClauseListSyntax(newClauses))
+    return ifConfigDecl.with(\.clauses, IfConfigClauseListSyntax(newClauses))
   }
 
   /// Returns a rewritten version of the given declaration if its modifier list contains `private`
@@ -161,7 +161,7 @@ public final class FileScopedDeclarationPrivacy: SyntaxFormatRule {
       let name = modifier.name
       if name.tokenKind == invalidAccess {
         diagnose(diagnostic, on: name)
-        return modifier.withName(name.withKind(validAccess))
+        return modifier.with(\.name, name.withKind(validAccess))
       }
       return modifier
     }

Sources/SwiftFormatRules/FullyIndirectEnum.swift

@@ -44,10 +44,10 @@ public final class FullyIndirectEnum: SyntaxFormatRule {
         return member
       }
 
-      let newCase = caseMember.withModifiers(modifiers.remove(name: "indirect"))
+      let newCase = caseMember.with(\.modifiers, modifiers.remove(name: "indirect"))
       let formattedCase = formatCase(
         unformattedCase: newCase, leadingTrivia: firstModifier.leadingTrivia)
-      return member.withDecl(DeclSyntax(formattedCase))
+      return member.with(\.decl, DeclSyntax(formattedCase))
     }
 
     // If the `indirect` keyword being added would be the first token in the decl, we need to move
@@ -70,8 +70,8 @@ public final class FullyIndirectEnum: SyntaxFormatRule {
       name: TokenSyntax.identifier(
         "indirect", leadingTrivia: leadingTrivia, trailingTrivia: .spaces(1)), detail: nil)
 
-    let newMemberBlock = node.members.withMembers(MemberDeclListSyntax(newMembers))
-    return DeclSyntax(newEnumDecl.addModifier(newModifier).withMembers(newMemberBlock))
+    let newMemberBlock = node.members.with(\.members, MemberDeclListSyntax(newMembers))
+    return DeclSyntax(newEnumDecl.addModifier(newModifier).with(\.members, newMemberBlock))
   }
 
   /// Returns a value indicating whether all enum cases in the given list are indirect.

Sources/SwiftFormatRules/GroupNumericLiterals.swift

@@ -59,7 +59,7 @@ public final class GroupNumericLiterals: SyntaxFormatRule {
     }
 
     newDigits = isNegative ? "-" + newDigits : newDigits
-    let result = node.withDigits(
+    let result = node.with(\.digits,
       TokenSyntax.integerLiteral(
         newDigits,
         leadingTrivia: node.digits.leadingTrivia,

Sources/SwiftFormatRules/NeverForceUnwrap.swift

@@ -31,7 +31,7 @@ public final class NeverForceUnwrap: SyntaxLintRule {
 
   public override func visit(_ node: ForcedValueExprSyntax) -> SyntaxVisitorContinueKind {
     guard context.importsXCTest == .doesNotImportXCTest else { return .skipChildren }
-    diagnose(.doNotForceUnwrap(name: node.expression.withoutTrivia().description), on: node)
+    diagnose(.doNotForceUnwrap(name: node.expression.with(\.leadingTrivia, []).with(\.trailingTrivia, []).description), on: node)
     return .skipChildren
   }
 
@@ -41,7 +41,7 @@ public final class NeverForceUnwrap: SyntaxLintRule {
     guard context.importsXCTest == .doesNotImportXCTest else { return .skipChildren }
     guard let questionOrExclamation = node.questionOrExclamationMark else { return .skipChildren }
     guard questionOrExclamation.tokenKind == .exclamationMark else { return .skipChildren }
-    diagnose(.doNotForceCast(name: node.typeName.withoutTrivia().description), on: node)
+    diagnose(.doNotForceCast(name: node.typeName.with(\.leadingTrivia, []).with(\.trailingTrivia, []).description), on: node)
     return .skipChildren
   }
 }

Sources/SwiftFormatRules/NeverUseImplicitlyUnwrappedOptionals.swift

@@ -59,7 +59,7 @@ public final class NeverUseImplicitlyUnwrappedOptionals: SyntaxLintRule {
     guard let violation = type.as(ImplicitlyUnwrappedOptionalTypeSyntax.self) else { return }
     diagnose(
       .doNotUseImplicitUnwrapping(
-        identifier: violation.wrappedType.withoutTrivia().description), on: type)
+        identifier: violation.wrappedType.with(\.leadingTrivia, []).with(\.trailingTrivia, []).description), on: type)
   }
 }
 

Sources/SwiftFormatRules/NoAccessLevelOnExtensionDeclaration.swift

@@ -39,7 +39,7 @@ public final class NoAccessLevelOnExtensionDeclaration: SyntaxFormatRule {
       let accessKeywordToAdd: DeclModifierSyntax
       if keywordKind == .keyword(.private) {
         accessKeywordToAdd
-          = accessKeyword.withName(accessKeyword.name.withKind(.keyword(.fileprivate)))
+          = accessKeyword.with(\.name, accessKeyword.name.withKind(.keyword(.fileprivate)))
       } else {
         accessKeywordToAdd = accessKeyword
       }
@@ -52,9 +52,9 @@ public final class NoAccessLevelOnExtensionDeclaration: SyntaxFormatRule {
         on: node.extensionKeyword,
         token: node.extensionKeyword,
         leadingTrivia: accessKeyword.leadingTrivia)
-      let result = node.withMembers(newMembers)
-        .withModifiers(modifiers.remove(name: accessKeyword.name.text))
-        .withExtensionKeyword(newKeyword)
+      let result = node.with(\.members, newMembers)
+        .with(\.modifiers, modifiers.remove(name: accessKeyword.name.text))
+        .with(\.extensionKeyword, newKeyword)
       return DeclSyntax(result)
 
     // Internal keyword redundant, delete
@@ -66,8 +66,8 @@ public final class NoAccessLevelOnExtensionDeclaration: SyntaxFormatRule {
         on: node.extensionKeyword,
         token: node.extensionKeyword,
         leadingTrivia: accessKeyword.leadingTrivia)
-      let result = node.withModifiers(modifiers.remove(name: accessKeyword.name.text))
-        .withExtensionKeyword(newKeyword)
+      let result = node.with(\.modifiers, modifiers.remove(name: accessKeyword.name.text))
+        .with(\.extensionKeyword, newKeyword)
       return DeclSyntax(result)
 
     default:
@@ -94,7 +94,7 @@ public final class NoAccessLevelOnExtensionDeclaration: SyntaxFormatRule {
         let newDecl = addModifier(declaration: member, modifierKeyword: formattedKeyword)
           .as(DeclSyntax.self)
       else { continue }
-      newMembers.append(memberItem.withDecl(newDecl))
+      newMembers.append(memberItem.with(\.decl, newDecl))
     }
     return MemberDeclListSyntax(newMembers)
   }