Skip to content

Commit b847e09

Browse files
authored
Introduce Swiftformat (#14)
* Introduce Swiftformat * Inline let * Run swift format
1 parent 91f8331 commit b847e09

19 files changed

Lines changed: 295 additions & 120 deletions

.swiftformat

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
# Tool options
2+
--minversion 0.48.11
3+
--swiftversion 5.4
4+
5+
# Format options
6+
--assetliterals visual-width
7+
--beforemarks
8+
# Uncomment if we decide to enable `organizeDeclarations` rule
9+
#--categorymark "MARK: - %c"
10+
--conflictmarkers reject
11+
--exponentcase lowercase
12+
--extensionmark "MARK: - %t + %c"
13+
--fragment false
14+
--funcattributes prev-line
15+
--groupedextension "MARK: %c"
16+
--guardelse auto
17+
--header ignore
18+
--hexgrouping none
19+
--hexliteralcase lowercase
20+
--ifdef no-indent
21+
--importgrouping alpha
22+
--indent 4
23+
--indentcase false
24+
--lifecycle
25+
--linebreaks lf
26+
--markextensions always
27+
--marktypes always
28+
--maxwidth none
29+
--modifierorder acl,setteracl,override,dynamic,mutators,lazy,final,class,static,required,convenience,typemethods,owned
30+
--nevertrailing
31+
--nospaceoperators ...,..<
32+
--nowrapoperators
33+
--octalgrouping none
34+
--organizetypes actor,class,enum,struct
35+
--patternlet inline
36+
--ranges spaced # ???
37+
--redundanttype inferred
38+
--self init-only
39+
--selfrequired
40+
--semicolons never
41+
--smarttabs enabled
42+
# Uncomment if we decide to enable `unusedArguments` rule
43+
#--stripunusedargs closure-only
44+
--structthreshold 0
45+
--tabwidth unspecified
46+
--trailingclosures
47+
--trimwhitespace always
48+
--typeattributes prev-line
49+
--typemark "MARK: - %t"
50+
--varattributes prev-line
51+
--voidtype void
52+
--wraparguments before-first
53+
--wrapcollections before-first
54+
--wrapconditions before-first
55+
--wrapparameters before-first
56+
--wrapreturntype preserve
57+
--xcodeindentation disabled
58+
59+
# Rules
60+
--rules andOperator
61+
--rules anyObjectProtocol
62+
--rules blankLinesAroundMark
63+
--rules blankLinesAtEndOfScope
64+
--rules blankLinesAtStartOfScope
65+
--rules blankLinesBetweenScopes
66+
--rules braces
67+
--rules consecutiveBlankLines
68+
--rules consecutiveSpaces
69+
--rules duplicateImports
70+
--rules elseOnSameLine
71+
--rules emptyBraces
72+
--disable enumNamespaces
73+
--rules extensionAccessControl
74+
--disable fileHeader
75+
--rules hoistPatternLet
76+
--rules indent
77+
--rules initCoderUnavailable
78+
--disable isEmpty
79+
--rules leadingDelimiters
80+
--rules linebreakAtEndOfFile
81+
--rules linebreaks
82+
--disable markTypes
83+
--rules modifierOrder
84+
--rules numberFormatting
85+
--disable organizeDeclarations
86+
--disable preferKeyPath
87+
--rules redundantBackticks
88+
--rules redundantBreak
89+
--rules redundantExtensionACL
90+
--rules redundantFileprivate
91+
--rules redundantGet
92+
--rules redundantInit
93+
--rules redundantLet
94+
--rules redundantLetError
95+
--rules redundantNilInit
96+
--rules redundantObjc
97+
--rules redundantParens
98+
--rules redundantPattern
99+
--rules redundantRawValues
100+
--rules redundantReturn
101+
--rules redundantSelf
102+
--rules redundantType
103+
--rules redundantVoidReturnType
104+
--rules semicolons
105+
--rules sortedImports
106+
--disable sortedSwitchCases
107+
--rules spaceAroundBraces
108+
--rules spaceAroundBrackets
109+
--rules spaceAroundComments
110+
--rules spaceAroundGenerics
111+
--rules spaceAroundOperators
112+
--rules spaceAroundParens
113+
--rules spaceInsideBraces
114+
--rules spaceInsideBrackets
115+
--rules spaceInsideComments
116+
--rules spaceInsideGenerics
117+
--rules spaceInsideParens
118+
--rules strongOutlets
119+
--rules strongifiedSelf
120+
--rules todos
121+
--rules trailingClosures
122+
--rules trailingCommas
123+
--rules trailingSpace
124+
--rules typeSugar
125+
--disable unusedArguments
126+
--rules void
127+
--disable wrap
128+
--rules wrapArguments
129+
--rules wrapAttributes
130+
--rules wrapEnumCases
131+
--rules wrapMultilineStatementBraces
132+
--disable wrapSwitchCases
133+
--rules yodaConditions

BottomSheetDemo.xcodeproj/project.pbxproj

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,7 @@
393393
isa = PBXNativeTarget;
394394
buildConfigurationList = 7D05F32E274139E100EBDBB1 /* Build configuration list for PBXNativeTarget "BottomSheet" */;
395395
buildPhases = (
396+
7D1A478E298DC8C2004832D4 /* Swiftformat */,
396397
7D05F326274139E100EBDBB1 /* Sources */,
397398
7D05F327274139E100EBDBB1 /* Frameworks */,
398399
7D05F328274139E100EBDBB1 /* CopyFiles */,
@@ -488,6 +489,27 @@
488489
};
489490
/* End PBXResourcesBuildPhase section */
490491

492+
/* Begin PBXShellScriptBuildPhase section */
493+
7D1A478E298DC8C2004832D4 /* Swiftformat */ = {
494+
isa = PBXShellScriptBuildPhase;
495+
buildActionMask = 2147483647;
496+
files = (
497+
);
498+
inputFileListPaths = (
499+
);
500+
inputPaths = (
501+
);
502+
name = Swiftformat;
503+
outputFileListPaths = (
504+
);
505+
outputPaths = (
506+
);
507+
runOnlyForDeploymentPostprocessing = 0;
508+
shellPath = /bin/sh;
509+
shellScript = "cd BuildTools\nSDKROOT=(xcrun --sdk macosx --show-sdk-path)\nswift run -c release swiftformat \"$SRCROOT\"\n";
510+
};
511+
/* End PBXShellScriptBuildPhase section */
512+
491513
/* Begin PBXSourcesBuildPhase section */
492514
7D05F2FD2741359800EBDBB1 /* Sources */ = {
493515
isa = PBXSourcesBuildPhase;

BottomSheetDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 11 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

BottomSheetDemo/Sources/User Interface/Helpers/UIControl+EventHandling.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ struct ButtonAction {
1414
let handler: () -> Void
1515
}
1616

17-
1817
extension UIButton {
1918
private final class ButtonAdapter {
2019
private let handler: () -> Void
@@ -24,14 +23,14 @@ extension UIButton {
2423
self.handler = handler
2524
self.controlEvent = controlEvent
2625
}
27-
26+
2827
@objc
2928
func handle() {
3029
handler()
3130
}
3231
}
3332

34-
static private var key: UInt8 = 0
33+
private static var key: UInt8 = 0
3534

3635
private var adapters: [ButtonAdapter] {
3736
get {
@@ -49,7 +48,7 @@ extension UIButton {
4948
setTitle(buttonAction.title, for: .normal)
5049
addEventHandler(handler: buttonAction.handler, controlEvent: .touchUpInside)
5150
}
52-
51+
5352
func addEventHandler(handler: @escaping () -> Void, controlEvent: UIControl.Event) {
5453
let adapter = ButtonAdapter(handler: handler, controlEvent: controlEvent)
5554
addTarget(adapter, action: #selector(ButtonAdapter.handle), for: controlEvent)

0 commit comments

Comments
 (0)