Skip to content

Commit 4477298

Browse files
committed
fix multiline parameter alignment for better readability
- enable `multiline_parameters_brackets` swiftlint rule
1 parent ad92734 commit 4477298

34 files changed

Lines changed: 432 additions & 322 deletions

.swiftlint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ opt_in_rules:
2525
- modifier_order
2626
- convenience_type
2727
- pattern_matching_keywords
28+
- multiline_parameters_brackets
2829

2930
custom_rules:
3031
spaces_over_tabs:

CodeEdit/Features/Documents/Controllers/CodeEditDocumentController.swift

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@ final class CodeEditDocumentController: NSDocumentController {
2121
}, onCancel: {})
2222
}
2323

24-
override func openDocument(withContentsOf url: URL,
25-
display displayDocument: Bool,
26-
completionHandler: @escaping (NSDocument?, Bool, Error?) -> Void) {
24+
override func openDocument(
25+
withContentsOf url: URL,
26+
display displayDocument: Bool,
27+
completionHandler: @escaping (NSDocument?, Bool, Error?) -> Void
28+
) {
2729
super.openDocument(withContentsOf: url, display: displayDocument) { document, documentWasAlreadyOpen, error in
2830

2931
if let document = document {

CodeEdit/Features/ExtensionsStore/API/ExtensionsStoreAPI.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,10 @@ enum ExtensionsStoreAPI {
8585
}
8686

8787
final class ExtensionsStoreAgent {
88-
func run<T: Decodable>(_ request: URLRequest,
89-
_ decoder: JSONDecoder = JSONDecoder()) -> AnyPublisher<APIResponse<T>, Error> {
88+
func run<T: Decodable>(
89+
_ request: URLRequest,
90+
_ decoder: JSONDecoder = JSONDecoder()
91+
) -> AnyPublisher<APIResponse<T>, Error> {
9092
URLSession.shared
9193
.dataTaskPublisher(for: request)
9294
.tryMap { result -> APIResponse<T> in

CodeEdit/Features/Feedback/Model/FeedbackModel.swift

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,12 @@ public class FeedbackModel: ObservableObject {
113113
/// The format for the issue body is how it will be displayed on
114114
/// repos issues. If any changes are made use markdown format
115115
/// because the text gets converted when created.
116-
private func createIssueBody(description: String,
117-
steps: String?,
118-
expectation: String?,
119-
actuallyHappened: String?) -> String {
116+
private func createIssueBody(
117+
description: String,
118+
steps: String?,
119+
expectation: String?,
120+
actuallyHappened: String?
121+
) -> String {
120122
"""
121123
**Description**
122124
@@ -136,11 +138,13 @@ public class FeedbackModel: ObservableObject {
136138
"""
137139
}
138140

139-
public func createIssue(title: String,
140-
description: String,
141-
steps: String?,
142-
expectation: String?,
143-
actuallyHappened: String?) {
141+
public func createIssue(
142+
title: String,
143+
description: String,
144+
steps: String?,
145+
expectation: String?,
146+
actuallyHappened: String?
147+
) {
144148
let gitAccounts = prefs.preferences.accounts.sourceControlAccounts.gitAccount
145149
let firstGitAccount = gitAccounts.first
146150

CodeEdit/Features/Git/Accounts/Bitbucket/BitBucketOAuthConfiguration.swift

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@ struct BitBucketOAuthConfiguration: GitRouterConfiguration {
1616
let webEndpoint: String
1717
let errorDomain = "com.codeedit.models.accounts.bitbucket"
1818

19-
init(_ url: String = GitURL.bitbucketBaseURL, webURL: String = GitURL.bitbucketWebURL,
20-
token: String, secret: String, scopes: [String]
19+
init(
20+
_ url: String = GitURL.bitbucketBaseURL,
21+
webURL: String = GitURL.bitbucketWebURL,
22+
token: String,
23+
secret: String,
24+
scopes: [String]
2125
) {
2226
apiEndpoint = url
2327
webEndpoint = webURL
@@ -43,9 +47,10 @@ struct BitBucketOAuthConfiguration: GitRouterConfiguration {
4347
return config
4448
}
4549

46-
func authorize(_ session: GitURLSession,
47-
code: String,
48-
completion: @escaping (_ config: BitBucketTokenConfiguration) -> Void
50+
func authorize(
51+
_ session: GitURLSession,
52+
code: String,
53+
completion: @escaping (_ config: BitBucketTokenConfiguration) -> Void
4954
) {
5055
let request = BitBucketOAuthRouter.accessToken(self, code).URLRequest
5156

@@ -79,9 +84,10 @@ struct BitBucketOAuthConfiguration: GitRouterConfiguration {
7984
}
8085
}
8186

82-
func handleOpenURL(_ session: GitURLSession = URLSession.shared,
83-
url: URL,
84-
completion: @escaping (_ config: BitBucketTokenConfiguration) -> Void
87+
func handleOpenURL(
88+
_ session: GitURLSession = URLSession.shared,
89+
url: URL,
90+
completion: @escaping (_ config: BitBucketTokenConfiguration) -> Void
8591
) {
8692
let params = url.bitbucketURLParameters()
8793

CodeEdit/Features/Git/Accounts/Bitbucket/BitBucketTokenConfiguration.swift

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ struct BitBucketTokenConfiguration: GitRouterConfiguration {
2323
expirationDate = currentDate.addingTimeInterval(TimeInterval(expiresIn ?? 0))
2424
}
2525

26-
init(_ token: String? = nil,
27-
refreshToken: String? = nil,
28-
expirationDate: Date? = nil,
29-
url: String = GitURL.bitbucketBaseURL
26+
init(
27+
_ token: String? = nil,
28+
refreshToken: String? = nil,
29+
expirationDate: Date? = nil,
30+
url: String = GitURL.bitbucketBaseURL
3031
) {
3132
apiEndpoint = url
3233
accessToken = token

CodeEdit/Features/Git/Accounts/Bitbucket/Model/BitBucketRepositories.swift

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,11 @@ enum BitbucketPaginatedResponse<T> {
4343

4444
extension BitBucketAccount {
4545

46-
func repositories(_ session: GitURLSession = URLSession.shared,
47-
userName: String? = nil,
48-
nextParameters: [String: String] = [:],
49-
completion: @escaping (_ response: BitbucketPaginatedResponse<[BitBucketRepositories]>) -> Void
46+
func repositories(
47+
_ session: GitURLSession = URLSession.shared,
48+
userName: String? = nil,
49+
nextParameters: [String: String] = [:],
50+
completion: @escaping (_ response: BitbucketPaginatedResponse<[BitBucketRepositories]>) -> Void
5051
) -> GitURLSessionDataTaskProtocol? {
5152
let router = BitBucketRepositoryRouter.readRepositories(configuration, userName, nextParameters)
5253

@@ -64,10 +65,11 @@ extension BitBucketAccount {
6465
}
6566
}
6667

67-
func repository(_ session: GitURLSession = URLSession.shared,
68-
owner: String,
69-
name: String,
70-
completion: @escaping (_ response: Result<BitBucketRepositories, Error>) -> Void
68+
func repository(
69+
_ session: GitURLSession = URLSession.shared,
70+
owner: String,
71+
name: String,
72+
completion: @escaping (_ response: Result<BitBucketRepositories, Error>) -> Void
7173
) -> GitURLSessionDataTaskProtocol? {
7274
let router = BitBucketRepositoryRouter.readRepository(configuration, owner, name)
7375

CodeEdit/Features/Git/Accounts/Bitbucket/Model/BitBucketUser.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ extension BitBucketAccount {
3939

4040
func me(
4141
_ session: GitURLSession = URLSession.shared,
42-
completion: @escaping (_ response: Result<BitBucketUser, Error>) -> Void) -> GitURLSessionDataTaskProtocol? {
42+
completion: @escaping (_ response: Result<BitBucketUser, Error>) -> Void
43+
) -> GitURLSessionDataTaskProtocol? {
4344

4445
let router = BitBucketUserRouter.readAuthenticatedUser(configuration)
4546

@@ -58,7 +59,8 @@ extension BitBucketAccount {
5859

5960
func emails(
6061
_ session: GitURLSession = URLSession.shared,
61-
completion: @escaping (_ response: Result<BitBucketEmail, Error>) -> Void) -> GitURLSessionDataTaskProtocol? {
62+
completion: @escaping (_ response: Result<BitBucketEmail, Error>) -> Void
63+
) -> GitURLSessionDataTaskProtocol? {
6264

6365
let router = BitBucketUserRouter.readEmails(configuration)
6466

CodeEdit/Features/Git/Accounts/GitHub/GitHubConfiguration.swift

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,13 @@ struct GitHubOAuthConfiguration: GitRouterConfiguration {
5454
return previewCustomHeaders
5555
}
5656

57-
init(_ url: String = GitURL.githubBaseURL, webURL: String = GitURL.githubWebURL,
58-
token: String, secret: String, scopes: [String], previewHeaders: [GitHubPreviewHeader] = []
57+
init(
58+
_ url: String = GitURL.githubBaseURL,
59+
webURL: String = GitURL.githubWebURL,
60+
token: String,
61+
secret: String,
62+
scopes: [String],
63+
previewHeaders: [GitHubPreviewHeader] = []
5964
) {
6065
apiEndpoint = url
6166
webEndpoint = webURL
@@ -72,7 +77,8 @@ struct GitHubOAuthConfiguration: GitRouterConfiguration {
7277
func authorize(
7378
_ session: GitURLSession = URLSession.shared,
7479
code: String,
75-
completion: @escaping (_ config: GitHubTokenConfiguration) -> Void) {
80+
completion: @escaping (_ config: GitHubTokenConfiguration) -> Void
81+
) {
7682

7783
let request = GitHubOAuthRouter.accessToken(self, code).URLRequest
7884
if let request = request {
@@ -98,7 +104,8 @@ struct GitHubOAuthConfiguration: GitRouterConfiguration {
98104
func handleOpenURL(
99105
_ session: GitURLSession = URLSession.shared,
100106
url: URL,
101-
completion: @escaping (_ config: GitHubTokenConfiguration) -> Void) {
107+
completion: @escaping (_ config: GitHubTokenConfiguration) -> Void
108+
) {
102109

103110
if let code = url.URLParameters["code"] {
104111
authorize(session, code: code) { config in

CodeEdit/Features/Git/Accounts/GitHub/Model/GitHubAccount+deleteReference.swift

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@ extension GitHubAccount {
2222
- completion: Callback for the outcome of the deletion.
2323
*/
2424
@discardableResult
25-
func deleteReference(_ session: GitURLSession = URLSession.shared,
26-
owner: String,
27-
repository: String,
28-
ref: String,
29-
completion: @escaping (_ response: Error?) -> Void
25+
func deleteReference(
26+
_ session: GitURLSession = URLSession.shared,
27+
owner: String,
28+
repository: String,
29+
ref: String,
30+
completion: @escaping (_ response: Error?) -> Void
3031
) -> GitURLSessionDataTaskProtocol? {
3132
let router = GitHubRouter.deleteReference(configuration, owner, repository, ref)
3233
return router.load(session, completion: completion)

0 commit comments

Comments
 (0)