Skip to content

Commit 85adf50

Browse files
committed
Adjustment for SwiftSyntax rename members -> memberBlock
Companion of swiftlang/swift-syntax#1524
1 parent 064d999 commit 85adf50

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

SwiftEvolve/Sources/SwiftEvolve/DeclContext.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public extension Decl {
171171

172172
public extension Decl where Self: DeclWithMembers {
173173
func lookupDirect(_ name: String) -> Decl? {
174-
for item in members.members {
174+
for item in memberBlock.members {
175175
guard let member = item.decl.as(Decl.self) else { continue }
176176
if member.name == name {
177177
return member

SwiftEvolve/Sources/SwiftEvolve/SyntaxExtensions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import SwiftSyntax
1919
import Foundation
2020

2121
public protocol DeclWithMembers: DeclSyntaxProtocol {
22-
var members: MemberDeclBlockSyntax { get set }
22+
var memberBlock: MemberDeclBlockSyntax { get set }
2323
}
2424

2525
extension ClassDeclSyntax: DeclWithMembers {}

SwiftEvolve/Tests/SwiftEvolveTests/RegressionTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class RegressionTests: XCTestCase {
6464

6565
XCTAssertThrowsError(
6666
try SynthesizeMemberwiseInitializerEvolution(
67-
for: Syntax(decl.members.members), in: dc, using: &unusedRNG
67+
for: Syntax(decl.memberBlock.members), in: dc, using: &unusedRNG
6868
),
6969
"Should throw when a stored property is in a #if block"
7070
)
@@ -99,7 +99,7 @@ class RegressionTests: XCTestCase {
9999

100100
XCTAssertNoThrow(
101101
try SynthesizeMemberwiseInitializerEvolution(
102-
for: Syntax(decl.members.members), in: dc, using: &unusedRNG
102+
for: Syntax(decl.memberBlock.members), in: dc, using: &unusedRNG
103103
),
104104
"Should not throw when properties are only non-stored"
105105
)
@@ -135,7 +135,7 @@ class RegressionTests: XCTestCase {
135135

136136
XCTAssertNoThrow(
137137
try SynthesizeMemberwiseInitializerEvolution(
138-
for: Syntax(decl.members.members), in: dc, using: &unusedRNG
138+
for: Syntax(decl.memberBlock.members), in: dc, using: &unusedRNG
139139
),
140140
"Should not throw when there's an explicit init"
141141
)

SwiftEvolve/Tests/SwiftEvolveTests/ShuffleMembersEvolutionTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class ShuffleMembersEvolutionTests: XCTestCase {
1919
let decl = code.filter(whereIs: EnumDeclSyntax.self).first!
2020
let dc = DeclContext(declarationChain: [code, decl])
2121
let evo = try ShuffleMembersEvolution(
22-
for: Syntax(decl.members.members), in: dc, using: &predictableRNG
22+
for: Syntax(decl.memberBlock.members), in: dc, using: &predictableRNG
2323
)
2424

2525
XCTAssertEqual(evo?.mapping.count, 3)

0 commit comments

Comments
 (0)