Skip to content

Commit c2aff38

Browse files
committed
swiftformat all the things
1 parent 1004428 commit c2aff38

File tree

465 files changed

+5400
-4923
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

465 files changed

+5400
-4923
lines changed

.swiftformat

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,43 @@
1-
# SwiftFormat (.swiftformat)
1+
--enable blankLineAfterImports
2+
--enable blankLinesAfterGuardStatements
3+
--enable blankLinesAroundMark
4+
--enable blankLinesAtEndOfScope
5+
--enable blankLinesBetweenChainedFunctions
6+
--enable blankLinesBetweenImports
7+
--enable blankLinesBetweenScopes
8+
--enable braces
9+
--enable conditionalAssignment
10+
--enable consecutiveBlankLines
11+
--enable consecutiveSpaces
12+
--enable consistentSwitchCaseSpacing
13+
--enable duplicateImports
14+
--enable elseOnSameLine
15+
--enable emptyBraces
16+
--enable environmentEntry
17+
--enable extensionAccessControl
18+
--enable genericExtensions
19+
--enable linebreakAtEndOfFile
20+
--enable modifierOrder
21+
--enable numberFormatting
22+
--enable opaqueGenericParameters
23+
--enable redundantInit
24+
--enable redundantOptionalBinding
25+
--enable sortImports
26+
--enable spaceAroundBraces
27+
--enable spaceAroundBrackets
28+
--enable spaceAroundComments
29+
--enable spaceAroundGenerics
30+
--enable spaceAroundOperators
31+
--enable spaceAroundParens
32+
--enable spaceInsideBraces
33+
--enable spaceInsideBrackets
34+
--enable spaceInsideComments
35+
--enable spaceInsideGenerics
36+
--enable spaceInsideParens
37+
--enable trailingClosures
38+
--enable trailingCommas
39+
--enable trailingSpace
40+
--enable wrapMultilineFunctionChains
241

3-
# ---- Core style options ----
442
--indent 2
43+
--swiftversion 6.2

App/Sources/Core/Accessibility/AXCollectionResolver.swift

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import AXEssibility
21
import AppKit
2+
import AXEssibility
33
import Foundation
44

55
enum AXCollectionResolverError: Error {
@@ -14,15 +14,17 @@ enum AXCollectionResolver {
1414
var match: AnyAccessibilityElement?
1515
for section in sections {
1616
guard let groups: [AnyAccessibilityElement] = try? section.value(.children, as: [AXUIElement].self)
17-
.map({ AnyAccessibilityElement($0, messagingTimeout: parent.messagingTimeout) }) else {
18-
continue
19-
}
17+
.map({ AnyAccessibilityElement($0, messagingTimeout: parent.messagingTimeout) })
18+
else {
19+
continue
20+
}
2021

2122
for group in groups {
2223
guard let children: [AnyAccessibilityElement] = try? group.value(.children, as: [AXUIElement].self)
23-
.map({ AnyAccessibilityElement($0, messagingTimeout: parent.messagingTimeout) }) else {
24-
continue
25-
}
24+
.map({ AnyAccessibilityElement($0, messagingTimeout: parent.messagingTimeout) })
25+
else {
26+
continue
27+
}
2628

2729
for child in children {
2830
if (try? child.value(.selected, as: Bool.self)) == true {

App/Sources/Core/Accessibility/AXEditorResolver.swift

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import AXEssibility
21
import AppKit
2+
import AXEssibility
33
import Foundation
44

55
enum AXEditorResolverError: Error {
@@ -12,10 +12,11 @@ enum AXEditorResolver {
1212
if var textRange = try? parent.value(.selectedTextRange, as: CFRange.self),
1313
let axValue = AXValueCreate(.cfRange, &textRange),
1414
let rect = try? parent.reference.parameterizedValue(
15-
key: kAXBoundsForRangeParameterizedAttribute,
16-
parameters: axValue,
17-
as: AXValue.self
18-
) {
15+
key: kAXBoundsForRangeParameterizedAttribute,
16+
parameters: axValue,
17+
as: AXValue.self,
18+
)
19+
{
1920
let defaultFrame = CGRect(x: -1, y: -1, width: -1, height: -1)
2021
var resolvedFrame: CGRect = defaultFrame
2122
_ = AXValueGetValue(rect, .cgRect, &resolvedFrame)

App/Sources/Core/Accessibility/AXGroupResolver.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import AXEssibility
21
import AppKit
2+
import AXEssibility
33
import Foundation
44

55
enum AXGroupResolverError: Error {
@@ -31,8 +31,7 @@ enum AXGroupResolver {
3131
guard let match, let frame = match.frame else {
3232
throw AXGroupResolverError.noResult
3333
}
34-
34+
3535
return frame
3636
}
3737
}
38-

App/Sources/Core/Accessibility/AXHTMLResolver.swift

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import AXEssibility
21
import AppKit
2+
import AXEssibility
33
import Foundation
44

55
enum AXHTMLResolverError: Error {
@@ -10,16 +10,18 @@ enum AXHTMLResolver {
1010
static func resolveFocusedElement(_ parent: AnyFocusedAccessibilityElement, snapshot: UserSpace.Snapshot) throws -> CGRect {
1111
var breadCrumb = ""
1212
if let result = try processElement(AnyAccessibilityElement(parent.reference), snapshot: snapshot, breadCrumb: &breadCrumb),
13-
let frame = result.frame {
13+
let frame = result.frame
14+
{
1415
return frame
1516
} else {
1617
throw AXHTMLResolverError.unableToResolveFrame
1718
}
1819
}
1920

20-
private static func processElement(_ element: AnyAccessibilityElement,
21+
private static func processElement(_ element: AnyAccessibilityElement,
2122
snapshot: UserSpace.Snapshot,
22-
breadCrumb: inout String) throws -> AnyAccessibilityElement? {
23+
breadCrumb: inout String) throws -> AnyAccessibilityElement?
24+
{
2325
var resolvedElement: AnyAccessibilityElement?
2426
let children: [AnyAccessibilityElement] = try element.value(.children, as: [AXUIElement].self)
2527
.map { AnyAccessibilityElement($0, messagingTimeout: element.messagingTimeout) }

App/Sources/Core/Accessibility/AXListResolver.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import AXEssibility
21
import AppKit
2+
import AXEssibility
33
import Foundation
44

55
enum AXListResolverError: Error {

App/Sources/Core/Accessibility/AXOutlineResolver.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import AXEssibility
21
import AppKit
2+
import AXEssibility
33
import Foundation
44

55
enum AXOutlineResolverError: Error {
@@ -14,6 +14,7 @@ enum AXOutlineResolver {
1414
var match: AnyAccessibilityElement?
1515
for child in children {
1616
guard (try? child.value(.selected, as: Bool.self)) == true else { continue }
17+
1718
match = child
1819
break
1920
}

App/Sources/Core/Accessibility/AXScrollAreaResolver.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import AXEssibility
21
import AppKit
2+
import AXEssibility
33
import Foundation
44

55
enum AXScrollAreaResolverError: Error {

App/Sources/Core/Accessibility/AXTableResolver.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import AXEssibility
21
import AppKit
2+
import AXEssibility
33
import Foundation
44

55
enum AXTableResolverError: Error {

App/Sources/Core/Accessibility/AXTextEntryAreaResolver.swift

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import AXEssibility
21
import AppKit
2+
import AXEssibility
33
import Foundation
44

55
enum AXTextEntryAreaResolverError: Error {
@@ -12,10 +12,11 @@ enum AXTextEntryAreaResolver {
1212
if var textRange: CFRange = try? parent.value(.selectedTextRange, as: CFRange.self),
1313
let axValue = AXValueCreate(.cfRange, &textRange),
1414
let rect = try? parent.reference.parameterizedValue(
15-
key: kAXBoundsForRangeParameterizedAttribute,
16-
parameters: axValue,
17-
as: AXValue.self
18-
) {
15+
key: kAXBoundsForRangeParameterizedAttribute,
16+
parameters: axValue,
17+
as: AXValue.self,
18+
)
19+
{
1920
let defaultFrame = CGRect(x: -1, y: -1, width: -1, height: -1)
2021
var resolvedFrame: CGRect = defaultFrame
2122
_ = AXValueGetValue(rect, .cgRect, &resolvedFrame)

0 commit comments

Comments
 (0)