Skip to content

Commit 29d5220

Browse files
wmontwewmontwe
committed
Add trailing comma allowance to code style
1 parent aebfd33 commit 29d5220

File tree

487 files changed

+1923
-1889
lines changed

Some content is hidden

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

487 files changed

+1923
-1889
lines changed

‎.editorconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ insert_final_newline = true
88

99
[*.{kt,kts}]
1010
ij_kotlin_imports_layout = *,^*
11+
ij_kotlin_allow_trailing_comma = true
12+
ij_kotlin_allow_trailing_comma_on_call_site = true
1113

1214
[*.{yml,yaml,json,toml}]
1315
indent_size = 2

‎app/autodiscovery/api/src/main/java/com/fsck/k9/autodiscovery/api/ConnectionSettingsDiscovery.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ data class DiscoveredServerSettings(
1515
val port: Int,
1616
val security: ConnectionSecurity,
1717
val authType: AuthType?,
18-
val username: String?
18+
val username: String?,
1919
)

‎app/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscovery.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import timber.log.Timber
1515

1616
class ProvidersXmlDiscovery(
1717
private val xmlProvider: ProvidersXmlProvider,
18-
private val oAuthConfigurationProvider: OAuthConfigurationProvider
18+
private val oAuthConfigurationProvider: OAuthConfigurationProvider,
1919
) : ConnectionSettingsDiscovery {
2020

2121
override fun discover(email: String): DiscoveryResults? {
@@ -151,6 +151,6 @@ class ProvidersXmlDiscovery(
151151
val incomingUriTemplate: String,
152152
val incomingUsernameTemplate: String,
153153
val outgoingUriTemplate: String,
154-
val outgoingUsernameTemplate: String
154+
val outgoingUsernameTemplate: String,
155155
)
156156
}

‎app/autodiscovery/providersxml/src/test/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscoveryTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class ProvidersXmlDiscoveryTest : RobolectricTest() {
3636
@Test
3737
fun discover_withUnknownDomain_shouldReturnNull() {
3838
val connectionSettings = providersXmlDiscovery.discover(
39-
"[email protected]"
39+
"[email protected]",
4040
)
4141

4242
assertThat(connectionSettings).isNull()
@@ -48,14 +48,14 @@ class ProvidersXmlDiscoveryTest : RobolectricTest() {
4848
scopes = listOf("irrelevant"),
4949
authorizationEndpoint = "irrelevant",
5050
tokenEndpoint = "irrelevant",
51-
redirectUri = "irrelevant"
51+
redirectUri = "irrelevant",
5252
)
5353

5454
return OAuthConfigurationProvider(
5555
configurations = mapOf(
56-
listOf("imap.gmail.com", "smtp.gmail.com") to googleConfig
56+
listOf("imap.gmail.com", "smtp.gmail.com") to googleConfig,
5757
),
58-
googleConfiguration = googleConfig
58+
googleConfiguration = googleConfig,
5959
)
6060
}
6161
}

‎app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/MiniDnsSrvResolver.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class MiniDnsSrvResolver : SrvResolver {
1212
val result = ResolverApi.INSTANCE.resolveSrv(
1313
DnsLabel.from(type.label),
1414
SrvProto.tcp.dnsLabel,
15-
DnsName.from(domain)
15+
DnsName.from(domain),
1616
)
1717

1818
val security = if (type.assumeTls) SSL_TLS_REQUIRED else STARTTLS_REQUIRED
@@ -22,7 +22,7 @@ class MiniDnsSrvResolver : SrvResolver {
2222
host = it.target.toString(),
2323
port = it.port,
2424
priority = it.priority,
25-
security = security
25+
security = security,
2626
)
2727
}
2828
}

‎app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscovery.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import com.fsck.k9.mail.AuthType
88
import com.fsck.k9.mail.ConnectionSecurity
99

1010
class SrvServiceDiscovery(
11-
private val srvResolver: MiniDnsSrvResolver
11+
private val srvResolver: MiniDnsSrvResolver,
1212
) : ConnectionSettingsDiscovery {
1313

1414
override fun discover(email: String): DiscoveryResults? {
@@ -36,21 +36,21 @@ fun newServerSettings(service: MailService, email: String): DiscoveredServerSett
3636
service.port,
3737
service.security,
3838
AuthType.PLAIN,
39-
email
39+
email,
4040
)
4141
}
4242

4343
enum class SrvType(val label: String, val protocol: String, val assumeTls: Boolean) {
4444
SUBMISSIONS("_submissions", "smtp", true),
4545
SUBMISSION("_submission", "smtp", false),
4646
IMAPS("_imaps", "imap", true),
47-
IMAP("_imap", "imap", false)
47+
IMAP("_imap", "imap", false),
4848
}
4949

5050
data class MailService(
5151
val srvType: SrvType,
5252
val host: String,
5353
val port: Int,
5454
val priority: Int,
55-
val security: ConnectionSecurity
55+
val security: ConnectionSecurity,
5656
)

‎app/autodiscovery/srvrecords/src/test/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscoveryTest.kt‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ class SrvServiceDiscoveryTest {
2424
val srvResolver = newMockSrvResolver(
2525
imapServices = listOf(newMailService(port = 143, srvType = SrvType.IMAP)),
2626
imapsServices = listOf(
27-
newMailService(port = 993, srvType = SrvType.IMAPS, security = ConnectionSecurity.SSL_TLS_REQUIRED)
28-
)
27+
newMailService(port = 993, srvType = SrvType.IMAPS, security = ConnectionSecurity.SSL_TLS_REQUIRED),
28+
),
2929
)
3030

3131
val srvServiceDiscovery = SrvServiceDiscovery(srvResolver)
@@ -42,14 +42,14 @@ class SrvServiceDiscoveryTest {
4242
newMailService(
4343
port = 25,
4444
srvType = SrvType.SUBMISSION,
45-
security = ConnectionSecurity.STARTTLS_REQUIRED
45+
security = ConnectionSecurity.STARTTLS_REQUIRED,
4646
),
4747
newMailService(
4848
port = 465,
4949
srvType = SrvType.SUBMISSIONS,
50-
security = ConnectionSecurity.SSL_TLS_REQUIRED
51-
)
52-
)
50+
security = ConnectionSecurity.SSL_TLS_REQUIRED,
51+
),
52+
),
5353
)
5454

5555
val srvServiceDiscovery = SrvServiceDiscovery(srvResolver)
@@ -68,64 +68,64 @@ class SrvServiceDiscoveryTest {
6868
port = 25,
6969
srvType = SrvType.SUBMISSION,
7070
security = ConnectionSecurity.STARTTLS_REQUIRED,
71-
priority = 0
71+
priority = 0,
7272
),
7373
newMailService(
7474
host = "smtp2.example.com",
7575
port = 25,
7676
srvType = SrvType.SUBMISSION,
7777
security = ConnectionSecurity.STARTTLS_REQUIRED,
78-
priority = 1
79-
)
78+
priority = 1,
79+
),
8080
),
8181
submissionsServices = listOf(
8282
newMailService(
8383
host = "smtp3.example.com",
8484
port = 465,
8585
srvType = SrvType.SUBMISSIONS,
8686
security = ConnectionSecurity.SSL_TLS_REQUIRED,
87-
priority = 0
87+
priority = 0,
8888
),
8989
newMailService(
9090
host = "smtp4.example.com",
9191
port = 465,
9292
srvType = SrvType.SUBMISSIONS,
9393
security = ConnectionSecurity.SSL_TLS_REQUIRED,
94-
priority = 1
95-
)
94+
priority = 1,
95+
),
9696
),
9797
imapServices = listOf(
9898
newMailService(
9999
host = "imap1.example.com",
100100
port = 143,
101101
srvType = SrvType.IMAP,
102102
security = ConnectionSecurity.STARTTLS_REQUIRED,
103-
priority = 0
103+
priority = 0,
104104
),
105105
newMailService(
106106
host = "imap2.example.com",
107107
port = 143,
108108
srvType = SrvType.IMAP,
109109
security = ConnectionSecurity.STARTTLS_REQUIRED,
110-
priority = 1
111-
)
110+
priority = 1,
111+
),
112112
),
113113
imapsServices = listOf(
114114
newMailService(
115115
host = "imaps1.example.com",
116116
port = 993,
117117
srvType = SrvType.IMAPS,
118118
security = ConnectionSecurity.SSL_TLS_REQUIRED,
119-
priority = 0
119+
priority = 0,
120120
),
121121
newMailService(
122122
host = "imaps2.example.com",
123123
port = 993,
124124
srvType = SrvType.IMAPS,
125125
security = ConnectionSecurity.SSL_TLS_REQUIRED,
126-
priority = 1
127-
)
128-
)
126+
priority = 1,
127+
),
128+
),
129129
)
130130

131131
val srvServiceDiscovery = SrvServiceDiscovery(srvResolver)
@@ -136,18 +136,18 @@ class SrvServiceDiscoveryTest {
136136
"smtp3.example.com",
137137
"smtp1.example.com",
138138
"smtp4.example.com",
139-
"smtp2.example.com"
139+
"smtp2.example.com",
140140
),
141-
result?.outgoing?.map { it.host }
141+
result?.outgoing?.map { it.host },
142142
)
143143
assertEquals(
144144
listOf(
145145
"imaps1.example.com",
146146
"imap1.example.com",
147147
"imaps2.example.com",
148-
"imap2.example.com"
148+
"imap2.example.com",
149149
),
150-
result?.incoming?.map { it.host }
150+
result?.incoming?.map { it.host },
151151
)
152152
}
153153

@@ -156,7 +156,7 @@ class SrvServiceDiscoveryTest {
156156
priority: Int = 0,
157157
security: ConnectionSecurity = ConnectionSecurity.STARTTLS_REQUIRED,
158158
srvType: SrvType,
159-
port: Int
159+
port: Int,
160160
): MailService {
161161
return MailService(srvType, host, port, priority, security)
162162
}
@@ -166,7 +166,7 @@ class SrvServiceDiscoveryTest {
166166
submissionServices: List<MailService> = listOf(),
167167
submissionsServices: List<MailService> = listOf(),
168168
imapServices: List<MailService> = listOf(),
169-
imapsServices: List<MailService> = listOf()
169+
imapsServices: List<MailService> = listOf(),
170170
): MiniDnsSrvResolver {
171171
return mock {
172172
on { lookup(host, SrvType.SUBMISSION) } doReturn submissionServices

‎app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProvider.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class ThunderbirdAutoconfigUrlProvider {
1313
createProviderUrl(domain, email),
1414
createDomainUrl(scheme = "https", domain),
1515
createDomainUrl(scheme = "http", domain),
16-
createIspDbUrl(domain)
16+
createIspDbUrl(domain),
1717
)
1818
}
1919

‎app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdDiscovery.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.fsck.k9.autodiscovery.api.DiscoveryResults
66
class ThunderbirdDiscovery(
77
private val urlProvider: ThunderbirdAutoconfigUrlProvider,
88
private val fetcher: ThunderbirdAutoconfigFetcher,
9-
private val parser: ThunderbirdAutoconfigParser
9+
private val parser: ThunderbirdAutoconfigParser,
1010
) : ConnectionSettingsDiscovery {
1111

1212
override fun discover(email: String): DiscoveryResults? {

‎app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,11 @@ class ThunderbirdAutoconfigTest {
162162
port = 993,
163163
security = ConnectionSecurity.SSL_TLS_REQUIRED,
164164
authType = AuthType.PLAIN,
165-
username = "[email protected]"
166-
)
165+
username = "[email protected]",
166+
),
167167
),
168-
listOf()
169-
)
168+
listOf(),
169+
),
170170
)
171171
}
172172
}

0 commit comments

Comments
 (0)