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

Ensure SwiftUI property reorder doesn't affect synthesized init (#1796)

Browse Source
This commit is contained in:
Miguel Jimenez
2024-11-09 11:26:29 +00:00
committed by Nick Lockwood
parent 97169a8682
commit fb3b551dfe
2 changed files with 84 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/DeclarationHelpers.swift
+1 -1
View File
@@ -1146,7 +1146,7 @@ extension Formatter {
_ category: Category
) -> Bool {
switch category.type {
case .instanceProperty:
case .swiftUIPropertyWrapper, .instanceProperty:
return true
case .instancePropertyWithBody:
Tests/Rules/OrganizeDeclarationsTests.swift
+83 -6
View File
@@ -2707,6 +2707,10 @@ class OrganizeDeclarationsTests: XCTestCase {
let input = """
struct ContentView: View {
init(label: String) {
self.label = label
}
private var label: String
@State
@@ -2729,6 +2733,12 @@ class OrganizeDeclarationsTests: XCTestCase {
let output = """
struct ContentView: View {
// MARK: Lifecycle
init(label: String) {
self.label = label
}
// MARK: Internal
@ViewBuilder
@@ -2765,10 +2775,15 @@ class OrganizeDeclarationsTests: XCTestCase {
let input = """
struct ContentView: View {
init(foo: Foo, baaz: Baaz) {
self.foo = foo
self.baaz = baaz
}
let foo: Foo
@State var bar: Bar
@State var bar = true
let baaz: Baaz
@State var quux: Quux
@State var quux = true
@ViewBuilder
private var toggle: some View {
@@ -2785,10 +2800,17 @@ class OrganizeDeclarationsTests: XCTestCase {
let output = """
struct ContentView: View {
// MARK: Lifecycle
init(foo: Foo, baaz: Baaz) {
self.foo = foo
self.baaz = baaz
}
// MARK: Internal
@State var bar: Bar
@State var quux: Quux
@State var bar = true
@State var quux = true
let foo: Foo
let baaz: Baaz
@@ -2820,8 +2842,14 @@ class OrganizeDeclarationsTests: XCTestCase {
let input = """
struct ContentView: View {
init(foo: Foo, baaz: Baaz, isOn: Binding<Bool>) {
self.foo = foo
self.baaz = baaz
self_.isOn = isOn
}
let foo: Foo
@State private var bar: Bar
@State private var bar = 0
private let baaz: Baaz
@Binding var isOn: Bool
@@ -2840,6 +2868,14 @@ class OrganizeDeclarationsTests: XCTestCase {
let output = """
struct ContentView: View {
// MARK: Lifecycle
init(foo: Foo, baaz: Baaz, isOn: Binding<Bool>) {
self.foo = foo
self.baaz = baaz
self_.isOn = isOn
}
// MARK: Internal
@Binding var isOn: Bool
@@ -2853,7 +2889,7 @@ class OrganizeDeclarationsTests: XCTestCase {
// MARK: Private
@State private var bar: Bar
@State private var bar = 0
private let baaz: Baaz
@@ -2877,6 +2913,11 @@ class OrganizeDeclarationsTests: XCTestCase {
let input = """
struct ContentView: View {
init(foo: Foo, baaz: Baaz) {
self.foo = foo
self.baaz = baaz
}
let foo: Foo
@Environment(\\.colorScheme) var colorScheme
let baaz: Baaz
@@ -2897,6 +2938,13 @@ class OrganizeDeclarationsTests: XCTestCase {
let output = """
struct ContentView: View {
// MARK: Lifecycle
init(foo: Foo, baaz: Baaz) {
self.foo = foo
self.baaz = baaz
}
// MARK: Internal
@Environment(\\.colorScheme) var colorScheme
@@ -3162,4 +3210,33 @@ class OrganizeDeclarationsTests: XCTestCase {
exclude: [.blankLinesAtStartOfScope, .blankLinesAtEndOfScope]
)
}
func testSwiftUIPropertyWrappersSortDoesntBreakViewSynthesizedMemberwiseInitializer() {
let input = """
struct ContentView: View {
let foo: Foo
@Environment(\\.colorScheme) var colorScheme
let baaz: Baaz
@Environment(\\.quux) let quux: Quux
@ViewBuilder
private var toggle: some View {
Toggle(label, isOn: $isOn)
}
@ViewBuilder
var body: some View {
toggle
}
}
"""
testFormatting(
for: input,
rule: .organizeDeclarations,
options: FormatOptions(organizeTypes: ["struct"], organizationMode: .visibility),
exclude: [.blankLinesAtStartOfScope, .blankLinesAtEndOfScope]
)
}
}