Skip to content

Commit c6484ec

Browse files
ahoppenahoppen
authored
Merge pull request #579 from ahoppen/ahoppen/fix-deprecation-warnings
Fix deprecation warnings from renamed nodes / types in SwiftSyntax
2 parents aca7a05 + acbe484 commit c6484ec

32 files changed

+182
-182
lines changed

‎Sources/SwiftFormat/Pipelines+Generated.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class LintPipeline: SyntaxVisitor {
3939
return .visitChildren
4040
}
4141

42-
override func visit(_ node: AssociatedtypeDeclSyntax) -> SyntaxVisitorContinueKind {
42+
override func visit(_ node: AssociatedTypeDeclSyntax) -> SyntaxVisitorContinueKind {
4343
visitIfEnabled(BeginDocumentationCommentWithOneLineSummary.visit, for: node)
4444
visitIfEnabled(NoLeadingUnderscores.visit, for: node)
4545
return .visitChildren
@@ -119,12 +119,12 @@ class LintPipeline: SyntaxVisitor {
119119
return .visitChildren
120120
}
121121

122-
override func visit(_ node: ForInStmtSyntax) -> SyntaxVisitorContinueKind {
122+
override func visit(_ node: ForStmtSyntax) -> SyntaxVisitorContinueKind {
123123
visitIfEnabled(UseWhereClausesInForLoops.visit, for: node)
124124
return .visitChildren
125125
}
126126

127-
override func visit(_ node: ForcedValueExprSyntax) -> SyntaxVisitorContinueKind {
127+
override func visit(_ node: ForceUnwrapExprSyntax) -> SyntaxVisitorContinueKind {
128128
visitIfEnabled(NeverForceUnwrap.visit, for: node)
129129
return .visitChildren
130130
}
@@ -194,12 +194,12 @@ class LintPipeline: SyntaxVisitor {
194194
return .visitChildren
195195
}
196196

197-
override func visit(_ node: MemberDeclBlockSyntax) -> SyntaxVisitorContinueKind {
197+
override func visit(_ node: MemberBlockSyntax) -> SyntaxVisitorContinueKind {
198198
visitIfEnabled(AmbiguousTrailingClosureOverload.visit, for: node)
199199
return .visitChildren
200200
}
201201

202-
override func visit(_ node: MemberDeclListSyntax) -> SyntaxVisitorContinueKind {
202+
override func visit(_ node: MemberBlockItemListSyntax) -> SyntaxVisitorContinueKind {
203203
visitIfEnabled(DoNotUseSemicolons.visit, for: node)
204204
return .visitChildren
205205
}
@@ -228,12 +228,12 @@ class LintPipeline: SyntaxVisitor {
228228
return .visitChildren
229229
}
230230

231-
override func visit(_ node: RepeatWhileStmtSyntax) -> SyntaxVisitorContinueKind {
231+
override func visit(_ node: RepeatStmtSyntax) -> SyntaxVisitorContinueKind {
232232
visitIfEnabled(NoParensAroundConditions.visit, for: node)
233233
return .visitChildren
234234
}
235235

236-
override func visit(_ node: SimpleTypeIdentifierSyntax) -> SyntaxVisitorContinueKind {
236+
override func visit(_ node: IdentifierTypeSyntax) -> SyntaxVisitorContinueKind {
237237
visitIfEnabled(UseShorthandTypeNames.visit, for: node)
238238
return .visitChildren
239239
}
@@ -249,7 +249,7 @@ class LintPipeline: SyntaxVisitor {
249249
return .visitChildren
250250
}
251251

252-
override func visit(_ node: SpecializeExprSyntax) -> SyntaxVisitorContinueKind {
252+
override func visit(_ node: GenericSpecializationExprSyntax) -> SyntaxVisitorContinueKind {
253253
visitIfEnabled(UseShorthandTypeNames.visit, for: node)
254254
return .visitChildren
255255
}
@@ -296,7 +296,7 @@ class LintPipeline: SyntaxVisitor {
296296
return .visitChildren
297297
}
298298

299-
override func visit(_ node: TypealiasDeclSyntax) -> SyntaxVisitorContinueKind {
299+
override func visit(_ node: TypeAliasDeclSyntax) -> SyntaxVisitorContinueKind {
300300
visitIfEnabled(AllPublicDeclarationsHaveDocumentation.visit, for: node)
301301
visitIfEnabled(BeginDocumentationCommentWithOneLineSummary.visit, for: node)
302302
visitIfEnabled(NoLeadingUnderscores.visit, for: node)

‎Sources/SwiftFormatCore/RuleMask.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ fileprivate class RuleStatusCollectionVisitor: SyntaxVisitor {
165165
return appendRuleStatusDirectives(from: firstToken, of: Syntax(node))
166166
}
167167

168-
override func visit(_ node: MemberDeclListItemSyntax) -> SyntaxVisitorContinueKind {
168+
override func visit(_ node: MemberBlockItemSyntax) -> SyntaxVisitorContinueKind {
169169
guard let firstToken = node.firstToken(viewMode: .sourceAccurate) else {
170170
return .visitChildren
171171
}

‎Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

Lines changed: 73 additions & 73 deletions
Large diffs are not rendered by default.

‎Sources/SwiftFormatRules/AddModifierRewriter.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ fileprivate final class AddModifierRewriter: SyntaxRewriter {
4949
return DeclSyntax(node.with(\.modifiers, newModifiers))
5050
}
5151

52-
override func visit(_ node: AssociatedtypeDeclSyntax) -> DeclSyntax {
52+
override func visit(_ node: AssociatedTypeDeclSyntax) -> DeclSyntax {
5353
// Check for modifiers, and, if none, insert the modifier and relocate trivia from the displaced
5454
// token.
5555
guard let modifiers = node.modifiers else {
@@ -114,7 +114,7 @@ fileprivate final class AddModifierRewriter: SyntaxRewriter {
114114
return DeclSyntax(node.with(\.modifiers, newModifiers))
115115
}
116116

117-
override func visit(_ node: TypealiasDeclSyntax) -> DeclSyntax {
117+
override func visit(_ node: TypeAliasDeclSyntax) -> DeclSyntax {
118118
// Check for modifiers, and, if none, insert the modifier and relocate trivia from the displaced
119119
// token.
120120
guard let modifiers = node.modifiers else {
@@ -163,7 +163,7 @@ fileprivate final class AddModifierRewriter: SyntaxRewriter {
163163
/// - Parameter modifiersProvider: A closure that returns all modifiers for the given node.
164164
private func nodeByRelocatingTrivia<NodeType: DeclSyntaxProtocol>(
165165
in node: NodeType,
166-
for modifiersProvider: (NodeType) -> ModifierListSyntax?
166+
for modifiersProvider: (NodeType) -> DeclModifierListSyntax?
167167
) -> NodeType {
168168
guard let modifier = modifiersProvider(node)?.firstAndOnly,
169169
let movingLeadingTrivia = modifier.nextToken(viewMode: .sourceAccurate)?.leadingTrivia

‎Sources/SwiftFormatRules/AllPublicDeclarationsHaveDocumentation.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@ public final class AllPublicDeclarationsHaveDocumentation: SyntaxLintRule {
6565
return .skipChildren
6666
}
6767

68-
public override func visit(_ node: TypealiasDeclSyntax) -> SyntaxVisitorContinueKind {
68+
public override func visit(_ node: TypeAliasDeclSyntax) -> SyntaxVisitorContinueKind {
6969
diagnoseMissingDocComment(DeclSyntax(node), name: node.name.text, modifiers: node.modifiers)
7070
return .skipChildren
7171
}
7272

7373
private func diagnoseMissingDocComment(
7474
_ decl: DeclSyntax,
7575
name: String,
76-
modifiers: ModifierListSyntax?
76+
modifiers: DeclModifierListSyntax?
7777
) {
7878
guard
7979
documentationCommentText(extractedFrom: decl.leadingTrivia) == nil,

‎Sources/SwiftFormatRules/AlwaysUseLowerCamelCase.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public final class AlwaysUseLowerCamelCase: SyntaxLintRule {
7171

7272
public override func visit(_ node: ClosureSignatureSyntax) -> SyntaxVisitorContinueKind {
7373
if let input = node.parameterClause {
74-
if let closureParamList = input.as(ClosureParamListSyntax.self) {
74+
if let closureParamList = input.as(ClosureShorthandParameterListSyntax.self) {
7575
for param in closureParamList {
7676
diagnoseLowerCamelCaseViolations(
7777
param.name, allowUnderscores: false, description: identifierDescription(for: node))
@@ -96,7 +96,7 @@ public final class AlwaysUseLowerCamelCase: SyntaxLintRule {
9696
secondName, allowUnderscores: false, description: identifierDescription(for: node))
9797
}
9898
}
99-
} else if let parameterClause = input.as(ParameterClauseSyntax.self) {
99+
} else if let parameterClause = input.as(FunctionParameterClauseSyntax.self) {
100100
for param in parameterClause.parameters {
101101
diagnoseLowerCamelCaseViolations(
102102
param.firstName, allowUnderscores: false, description: identifierDescription(for: node))
@@ -146,14 +146,14 @@ public final class AlwaysUseLowerCamelCase: SyntaxLintRule {
146146
/// Collects methods that look like XCTest test case methods from the given member list, inserting
147147
/// them into the given set.
148148
private func collectTestMethods(
149-
from members: MemberDeclListSyntax,
149+
from members: MemberBlockItemListSyntax,
150150
into set: inout Set<FunctionDeclSyntax>
151151
) {
152152
for member in members {
153153
if let ifConfigDecl = member.decl.as(IfConfigDeclSyntax.self) {
154154
// Recurse into any conditional member lists and collect their test methods as well.
155155
for clause in ifConfigDecl.clauses {
156-
if let clauseMembers = clause.elements?.as(MemberDeclListSyntax.self) {
156+
if let clauseMembers = clause.elements?.as(MemberBlockItemListSyntax.self) {
157157
collectTestMethods(from: clauseMembers, into: &set)
158158
}
159159
}
@@ -203,7 +203,7 @@ fileprivate func identifierDescription<NodeType: SyntaxProtocol>(for node: NodeT
203203
extension ReturnClauseSyntax {
204204
/// Whether this return clause specifies an explicit `Void` return type.
205205
fileprivate var isVoid: Bool {
206-
if let returnTypeIdentifier = type.as(SimpleTypeIdentifierSyntax.self) {
206+
if let returnTypeIdentifier = type.as(IdentifierTypeSyntax.self) {
207207
return returnTypeIdentifier.name.text == "Void"
208208
}
209209
if let returnTypeTuple = type.as(TupleTypeSyntax.self) {

‎Sources/SwiftFormatRules/AmbiguousTrailingClosureOverload.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public final class AmbiguousTrailingClosureOverload: SyntaxLintRule {
6565
return .visitChildren
6666
}
6767

68-
public override func visit(_ decls: MemberDeclBlockSyntax) -> SyntaxVisitorContinueKind {
68+
public override func visit(_ decls: MemberBlockSyntax) -> SyntaxVisitorContinueKind {
6969
let functions = decls.members.compactMap { $0.decl.as(FunctionDeclSyntax.self) }
7070
discoverAndDiagnoseOverloads(functions)
7171
return .visitChildren

‎Sources/SwiftFormatRules/BeginDocumentationCommentWithOneLineSummary.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ public final class BeginDocumentationCommentWithOneLineSummary: SyntaxLintRule {
7575
return .skipChildren
7676
}
7777

78-
public override func visit(_ node: TypealiasDeclSyntax) -> SyntaxVisitorContinueKind {
78+
public override func visit(_ node: TypeAliasDeclSyntax) -> SyntaxVisitorContinueKind {
7979
diagnoseDocComments(in: DeclSyntax(node))
8080
return .skipChildren
8181
}
8282

83-
public override func visit(_ node: AssociatedtypeDeclSyntax) -> SyntaxVisitorContinueKind {
83+
public override func visit(_ node: AssociatedTypeDeclSyntax) -> SyntaxVisitorContinueKind {
8484
diagnoseDocComments(in: DeclSyntax(node))
8585
return .skipChildren
8686
}

‎Sources/SwiftFormatRules/DoNotUseSemicolons.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ public final class DoNotUseSemicolons: SyntaxFormatRule {
103103
return nodeByRemovingSemicolons(from: node, nodeCreator: CodeBlockItemListSyntax.init)
104104
}
105105

106-
public override func visit(_ node: MemberDeclListSyntax) -> MemberDeclListSyntax {
107-
return nodeByRemovingSemicolons(from: node, nodeCreator: MemberDeclListSyntax.init)
106+
public override func visit(_ node: MemberBlockItemListSyntax) -> MemberBlockItemListSyntax {
107+
return nodeByRemovingSemicolons(from: node, nodeCreator: MemberBlockItemListSyntax.init)
108108
}
109109
}
110110

‎Sources/SwiftFormatRules/DontRepeatTypeInStaticProperties.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public final class DontRepeatTypeInStaticProperties: SyntaxLintRule {
6565
/// Iterates over the static/class properties in the given member list and diagnoses any where the
6666
/// name has the containing type name (excluding possible namespace prefixes, like `NS` or `UI`)
6767
/// as a suffix.
68-
private func diagnoseStaticMembers(_ members: MemberDeclListSyntax, endingWith typeName: String) {
68+
private func diagnoseStaticMembers(_ members: MemberBlockItemListSyntax, endingWith typeName: String) {
6969
for member in members {
7070
guard
7171
let varDecl = member.decl.as(VariableDeclSyntax.self),

0 commit comments

Comments
 (0)