Merge pull request #248 from ahoppen/ahoppen/swift-evolve-deprecation-warnings

Fix deprecation warnings in SwiftEvolve from renamed SwiftSyntax APIs

Author: ahoppen

SwiftEvolve/Sources/SwiftEvolve/DeclContext.swift

@@ -18,7 +18,7 @@
 import SwiftSyntax
 
 private func makeName(from declarationChain: [Decl]) -> String {
-  return declarationChain.map { $0.name }.joined(separator: ".")
+  return declarationChain.map { $0.nameString }.joined(separator: ".")
 }
 
 public struct DeclContext {
@@ -150,12 +150,12 @@ public protocol Decl {
   /// means we don't have to reimplement the property in terms of Syntax(self).
   var _syntaxNode: Syntax { get }
 
-  var name: String { get }
+  var nameString: String { get }
 
   var isResilient: Bool { get }
   var isStored: Bool { get }
 
-  var modifiers: ModifierListSyntax? { get }
+  var modifiers: DeclModifierListSyntax? { get }
 
   func lookupDirect(_ name: String) -> Decl?
 }
@@ -173,7 +173,7 @@ public extension Decl where Self: DeclWithMembers {
   func lookupDirect(_ name: String) -> Decl? {
     for item in memberBlock.members {
       guard let member = item.decl.as(Decl.self) else { continue }
-      if member.name == name {
+      if member.nameString == name {
         return member
       }
     }
@@ -186,7 +186,7 @@ public extension Decl where Self: AbstractFunctionDecl {
     guard let body = self.body else { return nil }
     for item in body.statements {
       guard let decl = item.item.as(Decl.self) else { continue }
-      if decl.name == name {
+      if decl.nameString == name {
         return decl
       }
     }
@@ -195,14 +195,14 @@ public extension Decl where Self: AbstractFunctionDecl {
 }
 
 extension SourceFileSyntax: Decl {
-  public var name: String { return "(file)" }
+  public var nameString: String { return "(file)" }
 
-  public var modifiers: ModifierListSyntax? { return nil }
+  public var modifiers: DeclModifierListSyntax? { return nil }
 
   public func lookupDirect(_ name: String) -> Decl? {
     for item in statements {
       guard let decl = item.item.as(Decl.self) else { continue }
-      if decl.name == name {
+      if decl.nameString == name {
         return decl
       }
     }
@@ -211,8 +211,8 @@ extension SourceFileSyntax: Decl {
 }
 
 extension ClassDeclSyntax: Decl {
-  public var name: String {
-    return identifier.text
+  public var nameString: String {
+    return name.text
   }
 
   public var isResilient: Bool {
@@ -221,8 +221,8 @@ extension ClassDeclSyntax: Decl {
 }
 
 extension StructDeclSyntax: Decl {
-  public var name: String {
-    return identifier.text
+  public var nameString: String {
+    return name.text
   }
 
   public var isResilient: Bool {
@@ -231,8 +231,8 @@ extension StructDeclSyntax: Decl {
 }
 
 extension EnumDeclSyntax: Decl {
-  public var name: String {
-    return identifier.text
+  public var nameString: String {
+    return name.text
   }
 
   public var isResilient: Bool {
@@ -241,30 +241,30 @@ extension EnumDeclSyntax: Decl {
 }
 
 extension ProtocolDeclSyntax: Decl {
-  public var name: String {
-    return identifier.text
+  public var nameString: String {
+    return name.text
   }
 }
 
 extension ExtensionDeclSyntax: Decl {
-  public var name: String {
+  public var nameString: String {
     return "(extension \(extendedType.typeText))"
   }
 }
 
-extension TypealiasDeclSyntax: Decl {
-  public var name: String {
-    return identifier.text
+extension TypeAliasDeclSyntax: Decl {
+  public var nameString: String {
+    return name.text
   }
 
   public func lookupDirect(_ name: String) -> Decl? {
     fatalError("Not implemented: \(type(of: self)).lookupDirect(_:)")
   }
 }
 
-extension AssociatedtypeDeclSyntax: Decl {
-  public var name: String {
-    return identifier.text
+extension AssociatedTypeDeclSyntax: Decl {
+  public var nameString: String {
+    return name.text
   }
 
   public func lookupDirect(_ name: String) -> Decl? {
@@ -338,7 +338,7 @@ extension VariableDeclSyntax: Decl {
     }
   }
 
-  public var name: String {
+  public var nameString: String {
     let list = boundProperties
     if list.count == 1 { return list.first!.name.text }
     let nameList = list.map { $0.name.text }
@@ -376,7 +376,7 @@ extension VariableDeclSyntax: Decl {
       case .accessors(let accessors):
         // Check the individual accessors.
         return accessors.allSatisfy { accessor in
-          switch accessor.accessorKind.text {
+          switch accessor.accessorSpecifier.text {
           case "willSet", "didSet":
             // These accessors are allowed on stored properties.
             return true
@@ -385,10 +385,6 @@ extension VariableDeclSyntax: Decl {
             return false
           }
         }
-
-      default:
-        // This binding doesn't include any computed getters.
-        return true
       }
     }
   }
@@ -399,27 +395,27 @@ extension VariableDeclSyntax: Decl {
 }
 
 extension EnumCaseElementSyntax {
-  var name: String {
+  var nameString: String {
     let params: String
-    if let paramList = associatedValue?.parameterList {
+    if let paramList = parameterClause?.parameters {
       params = paramList.map {
         "\($0.firstName?.text ?? "_"):"
       }.joined()
     }
     else {
       params = ""
     }
-    return "\(identifier.text)(\( params ))"
+    return "\(name.text)(\( params ))"
   }
 }
 
 extension EnumCaseDeclSyntax: Decl {
-  public var name: String {
+  public var nameString: String {
     if elements.count == 1 {
-      return elements.first!.name
+      return elements.first!.nameString
     }
     else {
-      return "(" + elements.map { $0.name }.joined(separator: ", ") + ")"
+      return "(" + elements.map { $0.nameString }.joined(separator: ", ") + ")"
     }
   }
 
@@ -435,7 +431,7 @@ extension EnumCaseDeclSyntax: Decl {
 extension IfConfigDeclSyntax {
   var containsStoredMembers: Bool {
     return clauses.contains { clause in
-      guard let members = clause.elements?.as(MemberDeclListSyntax.self) else {
+      guard let members = clause.elements?.as(MemberBlockItemListSyntax.self) else {
         return false
       }
 
@@ -468,7 +464,7 @@ extension Optional where Wrapped == AttributeListSyntax {
   }
 }
 
-extension Optional where Wrapped == ModifierListSyntax {
+extension Optional where Wrapped == DeclModifierListSyntax {
   func contains(named name: String) -> Bool {
     return self?.contains { $0.name.text == name } ?? false
   }

SwiftEvolve/Sources/SwiftEvolve/Evolution.swift

@@ -160,7 +160,7 @@ extension ShuffleMembersEvolution {
     where G: RandomNumberGenerator
   {
     guard
-      let membersList = node.as(MemberDeclListSyntax.self)
+      let membersList = node.as(MemberBlockItemListSyntax.self)
     else { throw EvolutionError.unsupported }
     let members = Array(membersList)
 
@@ -191,27 +191,27 @@ extension ShuffleMembersEvolution {
   }
 
   public func evolve(_ node: Syntax) -> Syntax {
-    let members = Array(node.as(MemberDeclListSyntax.self)!)
+    let members = Array(node.as(MemberBlockItemListSyntax.self)!)
 
     let inMapping = Set(mapping)
     let missing = members.indices.filter { !inMapping.contains($0) }
     let fullMapping = mapping + missing
 
-    return Syntax(MemberDeclListSyntax(fullMapping.map { members[$0] }))
+    return Syntax(MemberBlockItemListSyntax(fullMapping.map { members[$0] }))
   }
 }
 
 extension SynthesizeMemberwiseInitializerEvolution {
   public init?<G>(for node: Syntax, in decl: DeclContext, using rng: inout G) throws
     where G : RandomNumberGenerator
   {
-    guard let members = node.as(MemberDeclListSyntax.self) else {
+    guard let members = node.as(MemberBlockItemListSyntax.self) else {
       throw EvolutionError.unsupported
     }
     guard let lastDecl = decl.last.map(Syntax.init), lastDecl.is(StructDeclSyntax.self) else {
       return nil
     }
-    guard let parent = members.parent, parent.is(MemberDeclBlockSyntax.self) else {
+    guard let parent = members.parent, parent.is(MemberBlockSyntax.self) else {
       return nil
     }
 
@@ -260,7 +260,7 @@ extension SynthesizeMemberwiseInitializerEvolution {
       default:
         // Consistency check: This isn't somehow stored, is it?
         if let member = membersItem.decl.as(Decl.self) {
-          assert(!member.isStored, "\(member.name) is a stored non-property???")
+          assert(!member.isStored, "\(member.nameString) is a stored non-property???")
         }
 
         // If not, then we don't care.
@@ -288,7 +288,7 @@ extension SynthesizeMemberwiseInitializerEvolution {
   }
 
   public func evolve(_ node: Syntax) -> Syntax {
-    let members = node.as(MemberDeclListSyntax.self)!
+    let members = node.as(MemberBlockItemListSyntax.self)!
 
     let evolved = inits.reduce(members) { members, properties in
       let parameters = properties.mapToFunctionParameterClause {
@@ -298,9 +298,9 @@ extension SynthesizeMemberwiseInitializerEvolution {
           firstName: .identifier($0.name),
           secondName: nil,
           colon: .colonToken(trailingTrivia: [.spaces(1)]),
-          type: TypeSyntax(SimpleTypeIdentifierSyntax(name: .identifier($0.type), genericArgumentClause: nil)),
+          type: TypeSyntax(IdentifierTypeSyntax(name: .identifier($0.type), genericArgumentClause: nil)),
           ellipsis: nil,
-          defaultArgument: nil,
+          defaultValue: nil,
           trailingComma: nil
         )
       }
@@ -312,7 +312,7 @@ extension SynthesizeMemberwiseInitializerEvolution {
         return .expr(expr)
       }
 
-      let signature = FunctionSignatureSyntax(input: parameters)
+      let signature = FunctionSignatureSyntax(parameterClause: parameters)
 
       let newInitializer = InitializerDeclSyntax(
         attributes: nil,
@@ -332,7 +332,7 @@ extension SynthesizeMemberwiseInitializerEvolution {
         body: body
       )
 
-      return members.appending(MemberDeclListItemSyntax(
+      return members.appending(MemberBlockItemSyntax(
         decl: DeclSyntax(newInitializer),
         semicolon: nil
       ))

SwiftEvolve/Sources/SwiftEvolve/Evolver.swift

@@ -61,7 +61,7 @@ public class Evolver: SyntaxRewriter {
 
     // Cast makes this go through the overload with
     // visitPre()/visitAny()/visitPost().
-    return visit(Syntax(file))
+    return rewrite(Syntax(file))
   }
 
   var recursionGuard: Syntax?
@@ -78,7 +78,7 @@ public class Evolver: SyntaxRewriter {
 
     let nodePlan = plan[url, default: [:]][context.syntaxPath, default: []]
 
-    return nodePlan.reduce(visit(node)) { node, planned in
+    return nodePlan.reduce(rewrite(node)) { node, planned in
       log(type: .debug, "  Evolving \(planned.sourceLocation) by \(planned.evolution)")
       return planned.evolution.evolve(node)
     }

SwiftEvolve/Sources/SwiftEvolve/SyntaxConstructionExtensions.swift

@@ -48,15 +48,15 @@ extension Collection {
     innerTrailingTrivia: Trivia = [],
     outerTrailingTrivia: Trivia = [],
     _ transform: (Element) throws -> FunctionParameterSyntax
-  ) rethrows -> ParameterClauseSyntax {
+  ) rethrows -> FunctionParameterClauseSyntax {
     let params = try map(transform)
       .withCorrectTrailingCommas(betweenTrivia: betweenTrivia)
 
-    return ParameterClauseSyntax(
+    return FunctionParameterClauseSyntax(
       leftParen: .leftParenToken(
         leadingTrivia: outerLeadingTrivia, trailingTrivia: innerLeadingTrivia
       ),
-      parameterList: FunctionParameterListSyntax(params),
+      parameters: FunctionParameterListSyntax(params),
       rightParen: .rightParenToken(
         leadingTrivia: innerTrailingTrivia, trailingTrivia: outerTrailingTrivia
       )
@@ -115,7 +115,7 @@ struct ExprSyntaxTemplate {
     guard case .identifier(_) = identifier.tokenKind else {
       preconditionFailure("ExprSyntaxTemplate(var:) called with non-identifier \(identifier)")
     }
-    self.init(expr: ExprSyntax(IdentifierExprSyntax(identifier: identifier, declNameArguments: nil)))
+    self.init(expr: ExprSyntax(DeclReferenceExprSyntax(baseName: identifier, argumentNames: nil)))
   }
 
   init(_ name: String) {
@@ -132,7 +132,7 @@ struct ExprSyntaxTemplate {
     lhs: ExprSyntaxTemplate, rhs: ExprSyntaxTemplate
   ) -> ExprSyntaxTemplate {
     let assignment = AssignmentExprSyntax(
-      assignToken: .equalToken(
+      equal: .equalToken(
         leadingTrivia: .spaces(1), trailingTrivia: .spaces(1)
       )
     )
@@ -149,9 +149,8 @@ struct ExprSyntaxTemplate {
   subscript (dot identifier: TokenSyntax) -> ExprSyntaxTemplate {
     let memberAccess = MemberAccessExprSyntax(
       base: expr,
-      dot: .periodToken(),
-      name: identifier,
-      declNameArguments: nil
+      period: .periodToken(),
+      name: identifier
     )
     return .init(expr: ExprSyntax(memberAccess))
   }