Skip to content

Commit 687bad2

Browse files
committed
Fix deprecation message in SwiftSyntaxBuilder compatibility layer where the deprecated names were suggested instead of the new names
1 parent 47bea12 commit 687bad2

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntaxbuilder/RenamedChildrenBuilderCompatibilityFile.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ let renamedChildrenBuilderCompatibilityFile = try! SourceFileSyntax(leadingTrivi
2121
for layoutNode in SYNTAX_NODES.compactMap(\.layoutNode).filter({ $0.children.hasDeprecatedChild }) {
2222
if let convenienceInit = try layoutNode.createConvenienceBuilerInitializer(useDeprecatedChildName: true) {
2323
let deprecatedNames = layoutNode.children
24-
.filter { !$0.isUnexpectedNodes }
25-
.compactMap { $0.deprecatedName?.withFirstCharacterLowercased }
24+
.filter { !$0.isUnexpectedNodes && $0.deprecatedName != nil }
25+
.compactMap { $0.varName }
2626
.joined(separator: ", ")
2727

2828
DeclSyntax(

Sources/SwiftSyntaxBuilder/generated/RenamedChildrenBuilderCompatibility.swift

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import SwiftSyntax
1616

1717
extension AccessorDeclSyntax {
18-
@available(*, deprecated, message: "Use an initializer with accessorKind argument(s).")
18+
@available(*, deprecated, message: "Use an initializer with accessorSpecifier argument(s).")
1919
@_disfavoredOverload
2020
/// A convenience initializer that allows initializing syntax collections using result builders
2121
public init(
@@ -62,7 +62,7 @@ extension AccessorDeclSyntax {
6262
}
6363

6464
extension ArrayExprSyntax {
65-
@available(*, deprecated, message: "Use an initializer with leftSquareBracket, rightSquareBracket argument(s).")
65+
@available(*, deprecated, message: "Use an initializer with leftSquare, rightSquare argument(s).")
6666
@_disfavoredOverload
6767
/// A convenience initializer that allows initializing syntax collections using result builders
6868
public init(
@@ -91,7 +91,7 @@ extension ArrayExprSyntax {
9191
}
9292

9393
extension EnumDeclSyntax {
94-
@available(*, deprecated, message: "Use an initializer with genericParameters argument(s).")
94+
@available(*, deprecated, message: "Use an initializer with genericParameterClause argument(s).")
9595
@_disfavoredOverload
9696
/// A convenience initializer that allows initializing syntax collections using result builders
9797
public init(
@@ -140,7 +140,7 @@ extension EnumDeclSyntax {
140140
}
141141

142142
extension ExpressionSegmentSyntax {
143-
@available(*, deprecated, message: "Use an initializer with delimiter argument(s).")
143+
@available(*, deprecated, message: "Use an initializer with rawStringDelimiter argument(s).")
144144
@_disfavoredOverload
145145
/// A convenience initializer that allows initializing syntax collections using result builders
146146
public init(
@@ -177,7 +177,7 @@ extension ExpressionSegmentSyntax {
177177
}
178178

179179
extension GenericArgumentClauseSyntax {
180-
@available(*, deprecated, message: "Use an initializer with leftAngleBracket, rightAngleBracket argument(s).")
180+
@available(*, deprecated, message: "Use an initializer with leftAngle, rightAngle argument(s).")
181181
@_disfavoredOverload
182182
/// A convenience initializer that allows initializing syntax collections using result builders
183183
public init(
@@ -206,7 +206,7 @@ extension GenericArgumentClauseSyntax {
206206
}
207207

208208
extension GenericParameterClauseSyntax {
209-
@available(*, deprecated, message: "Use an initializer with leftAngleBracket, genericParameterList, rightAngleBracket argument(s).")
209+
@available(*, deprecated, message: "Use an initializer with leftAngle, parameters, rightAngle argument(s).")
210210
@_disfavoredOverload
211211
/// A convenience initializer that allows initializing syntax collections using result builders
212212
public init(
@@ -239,7 +239,7 @@ extension GenericParameterClauseSyntax {
239239
}
240240

241241
extension KeyPathSubscriptComponentSyntax {
242-
@available(*, deprecated, message: "Use an initializer with leftBracket, rightBracket argument(s).")
242+
@available(*, deprecated, message: "Use an initializer with leftSquare, rightSquare argument(s).")
243243
@_disfavoredOverload
244244
/// A convenience initializer that allows initializing syntax collections using result builders
245245
public init(
@@ -268,7 +268,7 @@ extension KeyPathSubscriptComponentSyntax {
268268
}
269269

270270
extension MacroExpansionDeclSyntax {
271-
@available(*, deprecated, message: "Use an initializer with poundToken, genericArguments argument(s).")
271+
@available(*, deprecated, message: "Use an initializer with pound, genericArgumentClause argument(s).")
272272
@_disfavoredOverload
273273
/// A convenience initializer that allows initializing syntax collections using result builders
274274
public init(
@@ -325,7 +325,7 @@ extension MacroExpansionDeclSyntax {
325325
}
326326

327327
extension MacroExpansionExprSyntax {
328-
@available(*, deprecated, message: "Use an initializer with poundToken, genericArguments argument(s).")
328+
@available(*, deprecated, message: "Use an initializer with pound, genericArgumentClause argument(s).")
329329
@_disfavoredOverload
330330
/// A convenience initializer that allows initializing syntax collections using result builders
331331
public init(
@@ -374,7 +374,7 @@ extension MacroExpansionExprSyntax {
374374
}
375375

376376
extension SourceFileSyntax {
377-
@available(*, deprecated, message: "Use an initializer with eOFToken argument(s).")
377+
@available(*, deprecated, message: "Use an initializer with endOfFileToken argument(s).")
378378
@_disfavoredOverload
379379
/// A convenience initializer that allows initializing syntax collections using result builders
380380
public init(
@@ -399,7 +399,7 @@ extension SourceFileSyntax {
399399
}
400400

401401
extension SubscriptExprSyntax {
402-
@available(*, deprecated, message: "Use an initializer with leftBracket, rightBracket argument(s).")
402+
@available(*, deprecated, message: "Use an initializer with leftSquare, rightSquare argument(s).")
403403
@_disfavoredOverload
404404
/// A convenience initializer that allows initializing syntax collections using result builders
405405
public init(
@@ -440,7 +440,7 @@ extension SubscriptExprSyntax {
440440
}
441441

442442
extension TupleExprSyntax {
443-
@available(*, deprecated, message: "Use an initializer with elementList argument(s).")
443+
@available(*, deprecated, message: "Use an initializer with elements argument(s).")
444444
@_disfavoredOverload
445445
/// A convenience initializer that allows initializing syntax collections using result builders
446446
public init(
@@ -469,7 +469,7 @@ extension TupleExprSyntax {
469469
}
470470

471471
extension VariableDeclSyntax {
472-
@available(*, deprecated, message: "Use an initializer with bindingKeyword argument(s).")
472+
@available(*, deprecated, message: "Use an initializer with bindingSpecifier argument(s).")
473473
@_disfavoredOverload
474474
/// A convenience initializer that allows initializing syntax collections using result builders
475475
public init(

0 commit comments

Comments
 (0)