GitHub/SwiftFormat
1
0
Fork 0
mirror of https://github.com/nicklockwood/SwiftFormat.git synced 2026-06-16 10:34:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly handle _modify accessor

Browse Source
This commit is contained in:
Nick Lockwood
2024-06-09 18:47:04 +01:00
parent e51ce8a47e
commit 89fa2935c4
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/FormattingHelpers.swift
+2 -2
View File
@@ -2870,7 +2870,7 @@ extension Formatter {
["static", "class"].contains(string)
})
if let name = name, classOrStatic || !staticSelf {
processAccessors(["get", "set", "willSet", "didSet", "init"], for: name,
processAccessors(["get", "set", "willSet", "didSet", "init", "_modify"], for: name,
at: &index, localNames: localNames, members: members,
typeStack: &typeStack, closureStack: &closureStack,
membersByType: &membersByType,
@@ -3186,7 +3186,7 @@ extension Formatter {
token = tokens[nextIndex]
}
switch token.string {
case "get":
case "get", "_modify":
localNames.insert(name)
case "set", "init":
localNames.insert(name)
Sources/Inference.swift
+1 -1
View File
@@ -994,7 +994,7 @@ private struct Inference {
prevIndex -= 1
}
if let name = name {
processAccessors(["get", "set", "willSet", "didSet", "init"], for: name,
processAccessors(["get", "set", "willSet", "didSet", "init", "_modify"], for: name,
at: &index, localNames: localNames, members: members,
typeStack: &typeStack, membersByType: &membersByType,
classMembersByType: &classMembersByType,
Sources/ParsingHelpers.swift
+2 -2
View File
@@ -668,7 +668,7 @@ extension Formatter {
func isAccessorKeyword(at i: Int, checkKeyword: Bool = true) -> Bool {
guard !checkKeyword ||
["get", "set", "willSet", "didSet", "init"].contains(token(at: i)?.string ?? ""),
["get", "set", "willSet", "didSet", "init", "_modify"].contains(token(at: i)?.string ?? ""),
var prevIndex = index(of: .nonSpaceOrCommentOrLinebreak, before: i)
else {
return false
@@ -1120,7 +1120,7 @@ extension Formatter {
return true
}
return false
case "get", "set", "willSet", "didSet", "init":
case "get", "set", "willSet", "didSet", "init", "_modify":
return isAccessorKeyword(at: i, checkKeyword: false)
case "actor":
if last(.nonSpaceOrCommentOrLinebreak, before: i)?.isOperator(ofType: .infix) == true {