Skip to content

Accessor #29

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
merged 2 commits into from
Mar 17, 2025
Merged

Accessor #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f1cfc6
Patch
muukii Mar 10, 2025
3c6481a
Update
muukii Mar 17, 2025
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
16 changes: 14 additions & 2 deletions Sources/StateStructMacros/COWTrackingPropertyMacro.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,15 @@ extension COWTrackingPropertyMacro: PeerMacro {
guard let variableDecl = declaration.as(VariableDeclSyntax.self) else {
return []
}

guard variableDecl.typeSyntax != nil else {
context.addDiagnostics(from: Error.needsTypeAnnotation, node: declaration)
return []
}

let isPublic = variableDecl.modifiers.contains(where: { $0.name.tokenKind == .keyword(.public) })
let isPrivate = variableDecl.modifiers.contains(where: { $0.name.tokenKind == .keyword(.private) })

var newMembers: [DeclSyntax] = []

let ignoreMacroAttached = variableDecl.attributes.contains {
Expand Down Expand Up @@ -98,9 +101,18 @@ extension COWTrackingPropertyMacro: PeerMacro {

newMembers.append(DeclSyntax(_variableDecl))

var accessor: String
if isPrivate {
accessor = "private"
} else if isPublic {
accessor = "public"
} else {
accessor = "internal"
}

do {
let referencingAccessor = """
public var $\(raw: variableDecl.name): Referencing<\(variableDecl.typeSyntax!.trimmed)> {
\(raw: accessor) var $\(raw: variableDecl.name): Referencing<\(variableDecl.typeSyntax!.trimmed)> {
Referencing(storage: _backing_\(raw: variableDecl.name))
}
""" as DeclSyntax
Expand Down
10 changes: 5 additions & 5 deletions Tests/StateStructMacroTests/COWTrackingProperyMacroTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ final class COWTrackingProperyMacroTests: XCTestCase {
}
var _backing_stored_0: _BackingStorage<Int> = _BackingStorage.init(18)

public var $stored_0: Referencing<Int> {
internal var $stored_0: Referencing<Int> {
Referencing(storage: _backing_stored_0)
}

Expand Down Expand Up @@ -154,7 +154,7 @@ final class COWTrackingProperyMacroTests: XCTestCase {
}
var _backing_stored_1: _BackingStorage<Int> = _BackingStorage.init(18)

public var $stored_1: Referencing<Int> {
internal var $stored_1: Referencing<Int> {
Referencing(storage: _backing_stored_1)
}

Expand Down Expand Up @@ -195,7 +195,7 @@ final class COWTrackingProperyMacroTests: XCTestCase {
}
var _backing_stored_2: _BackingStorage<Int> = _BackingStorage.init(18)

public var $stored_2: Referencing<Int> {
internal var $stored_2: Referencing<Int> {
Referencing(storage: _backing_stored_2)
}

Expand Down Expand Up @@ -314,7 +314,7 @@ final class COWTrackingProperyMacroTests: XCTestCase {
}
var _backing_stored_1: _BackingStorage<Int?> = _BackingStorage.init(nil)

public var $stored_1: Referencing<Int?> {
internal var $stored_1: Referencing<Int?> {
Referencing(storage: _backing_stored_1)
}

Expand Down Expand Up @@ -392,7 +392,7 @@ final class COWTrackingProperyMacroTests: XCTestCase {
}
private var _backing_stored_0: _BackingStorage<Int> = _BackingStorage.init(18)

public var $stored_0: Referencing<Int> {
private var $stored_0: Referencing<Int> {
Referencing(storage: _backing_stored_0)
}

Expand Down