Skip to content

Adjustment for SwiftSyntax rename members -> memberBlock #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahoppen merged 1 commit into from
Apr 15, 2023
Merged

Adjustment for SwiftSyntax rename members -> memberBlock #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SwiftEvolve/Sources/SwiftEvolve/DeclContext.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ public extension Decl {

public extension Decl where Self: DeclWithMembers {
func lookupDirect(_ name: String) -> Decl? {
for item in members.members {
for item in memberBlock.members {
guard let member = item.decl.as(Decl.self) else { continue }
if member.name == name {
return member
Expand Down
2 changes: 1 addition & 1 deletion SwiftEvolve/Sources/SwiftEvolve/SyntaxExtensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import SwiftSyntax
import Foundation

public protocol DeclWithMembers: DeclSyntaxProtocol {
var members: MemberDeclBlockSyntax { get set }
var memberBlock: MemberDeclBlockSyntax { get set }
}

extension ClassDeclSyntax: DeclWithMembers {}
Expand Down
6 changes: 3 additions & 3 deletions SwiftEvolve/Tests/SwiftEvolveTests/RegressionTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class RegressionTests: XCTestCase {

XCTAssertThrowsError(
try SynthesizeMemberwiseInitializerEvolution(
for: Syntax(decl.members.members), in: dc, using: &unusedRNG
for: Syntax(decl.memberBlock.members), in: dc, using: &unusedRNG
),
"Should throw when a stored property is in a #if block"
)
Expand Down Expand Up @@ -99,7 +99,7 @@ class RegressionTests: XCTestCase {

XCTAssertNoThrow(
try SynthesizeMemberwiseInitializerEvolution(
for: Syntax(decl.members.members), in: dc, using: &unusedRNG
for: Syntax(decl.memberBlock.members), in: dc, using: &unusedRNG
),
"Should not throw when properties are only non-stored"
)
Expand Down Expand Up @@ -135,7 +135,7 @@ class RegressionTests: XCTestCase {

XCTAssertNoThrow(
try SynthesizeMemberwiseInitializerEvolution(
for: Syntax(decl.members.members), in: dc, using: &unusedRNG
for: Syntax(decl.memberBlock.members), in: dc, using: &unusedRNG
),
"Should not throw when there's an explicit init"
)
Expand Down
2 changes: 1 addition & 1 deletion SwiftEvolve/Tests/SwiftEvolveTests/ShuffleMembersEvolutionTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class ShuffleMembersEvolutionTests: XCTestCase {
let decl = code.filter(whereIs: EnumDeclSyntax.self).first!
let dc = DeclContext(declarationChain: [code, decl])
let evo = try ShuffleMembersEvolution(
for: Syntax(decl.members.members), in: dc, using: &predictableRNG
for: Syntax(decl.memberBlock.members), in: dc, using: &predictableRNG
)

XCTAssertEqual(evo?.mapping.count, 3)
Expand Down