Skip to content

Commit 39c9bc8

Browse files
authored
Merge pull request #65126 from ahoppen/ahoppen/memberblock
Adjustment for SwiftSyntax rename `members` -> `memberBlock`
2 parents 9fc8918 + 42cb41d commit 39c9bc8

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

lib/ASTGen/Sources/ASTGen/Decls.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ extension ASTGenVisitor {
3939
declContext = out.declContext
4040
defer { declContext = oldDeclContext }
4141

42-
node.members.members
42+
node.memberBlock.members
4343
.map { self.visit($0).rawValue }
4444
.withBridgedArrayRef { ref in
4545
NominalTypeDecl_setMembers(out.nominalDecl, ref)
@@ -60,7 +60,7 @@ extension ASTGenVisitor {
6060
declContext = out.declContext
6161
defer { declContext = oldDeclContext }
6262

63-
node.members.members
63+
node.memberBlock.members
6464
.map { self.visit($0).rawValue }
6565
.withBridgedArrayRef { ref in
6666
NominalTypeDecl_setMembers(out.nominalDecl, ref)

lib/Macros/Sources/ObservationMacros/ObservableMacro.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public struct ObservableMacro: MemberMacro, MemberAttributeMacro, ConformanceMac
7171
"""
7272

7373
let memberList = MemberDeclListSyntax(
74-
declaration.members.members.filter {
74+
declaration.memberBlock.members.filter {
7575
$0.decl.isObservableStoredProperty
7676
}
7777
)

lib/Macros/Sources/SwiftMacros/OptionSetMacro.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public struct OptionSetMacro {
9797
}
9898

9999
// Find the option enum within the struct.
100-
let optionsEnums: [EnumDeclSyntax] = decl.members.members.compactMap({ member in
100+
let optionsEnums: [EnumDeclSyntax] = decl.memberBlock.members.compactMap({ member in
101101
if let enumDecl = member.decl.as(EnumDeclSyntax.self),
102102
enumDecl.identifier.text == optionsEnumName {
103103
return enumDecl
@@ -163,7 +163,7 @@ extension OptionSetMacro: MemberMacro {
163163

164164
// Find all of the case elements.
165165
var caseElements: [EnumCaseElementSyntax] = []
166-
for member in optionsEnum.members.members {
166+
for member in optionsEnum.memberBlock.members {
167167
if let caseDecl = member.decl.as(EnumCaseDeclSyntax.self) {
168168
caseElements.append(contentsOf: caseDecl.elements)
169169
}

test/Macros/Inputs/syntax_macro_definitions.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ extension DeclGroupSyntax {
681681
/// Enumerate the stored properties that syntactically occur in this
682682
/// declaration.
683683
func storedProperties() -> [VariableDeclSyntax] {
684-
return members.members.compactMap { member in
684+
return memberBlock.members.compactMap { member in
685685
guard let variable = member.decl.as(VariableDeclSyntax.self),
686686
variable.isStoredProperty else {
687687
return nil
@@ -1020,7 +1020,7 @@ public struct ObservableMacro: MemberMacro, MemberAttributeMacro {
10201020
"""
10211021

10221022
let memberList = MemberDeclListSyntax(
1023-
declaration.members.members.filter {
1023+
declaration.memberBlock.members.filter {
10241024
$0.decl.isObservableStoredProperty
10251025
}
10261026
)

0 commit comments

Comments
 (0)