-
Notifications
You must be signed in to change notification settings - Fork 501
/
TrailingCommaOnDeclarationSiteRuleTest.kt
562 lines (528 loc) · 21.4 KB
/
TrailingCommaOnDeclarationSiteRuleTest.kt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
package com.pinterest.ktlint.ruleset.standard
import com.pinterest.ktlint.core.RuleProvider
import com.pinterest.ktlint.ruleset.standard.TrailingCommaOnDeclarationSiteRule.Companion.allowTrailingCommaProperty
import com.pinterest.ktlint.test.KtLintAssertThat
import com.pinterest.ktlint.test.LintViolation
import org.junit.jupiter.api.Test
class TrailingCommaOnDeclarationSiteRuleTest {
private val ruleAssertThat =
KtLintAssertThat.assertThatRule(
provider = { TrailingCommaOnDeclarationSiteRule() },
additionalRuleProviders = setOf(
// Apply the IndentationRule always as additional rule, so that the formattedCode in the unit test looks
// correct.
RuleProvider { IndentationRule() }
)
)
@Test
fun `Given property allow trailing comma on declaration site is not set then remove trailing comma's`() {
val code =
"""
data class Foo1(val bar: Int,)
class Foo2<A, B,> {}
fun foo3(bar: Int): String = when(bar) {
1, 2, -> "a"
else -> "b"
}
fun foo4() {
fun bar(): Pair<Int, Int> = Pair(1, 2)
val (x, y,) = bar()
}
val foo5: (Int, Int,) -> Int = 42
val foo6: (Int, Int,) -> Int = { foo, bar, -> foo * bar }
""".trimIndent()
val formattedCode =
"""
data class Foo1(val bar: Int)
class Foo2<A, B> {}
fun foo3(bar: Int): String = when(bar) {
1, 2 -> "a"
else -> "b"
}
fun foo4() {
fun bar(): Pair<Int, Int> = Pair(1, 2)
val (x, y) = bar()
}
val foo5: (Int, Int) -> Int = 42
val foo6: (Int, Int) -> Int = { foo, bar -> foo * bar }
""".trimIndent()
ruleAssertThat(code)
.hasLintViolations(
LintViolation(1, 29, "Unnecessary trailing comma before \")\""),
LintViolation(3, 16, "Unnecessary trailing comma before \">\""),
LintViolation(6, 9, "Unnecessary trailing comma before \"->\""),
LintViolation(13, 14, "Unnecessary trailing comma before \")\""),
LintViolation(16, 20, "Unnecessary trailing comma before \")\""),
LintViolation(18, 20, "Unnecessary trailing comma before \")\""),
LintViolation(18, 42, "Unnecessary trailing comma before \"->\"")
).isFormattedAs(formattedCode)
}
@Test
fun `Given that the trailing comma is not allowed on declaration site then remove it from an parameter list when present`() {
val code =
"""
data class Foo1(val bar: Int,)
data class Foo2(
val bar: Int, // The comma before the comment should be removed without removing the comment itself
)
data class Foo3(
val bar: Int, /* The comma before the comment should be removed without removing the comment itself */
)
""".trimIndent()
val formattedCode =
"""
data class Foo1(val bar: Int)
data class Foo2(
val bar: Int // The comma before the comment should be removed without removing the comment itself
)
data class Foo3(
val bar: Int /* The comma before the comment should be removed without removing the comment itself */
)
""".trimIndent()
ruleAssertThat(code)
.withEditorConfigOverride(allowTrailingCommaProperty to false)
.hasLintViolations(
LintViolation(1, 29, "Unnecessary trailing comma before \")\""),
LintViolation(3, 17, "Unnecessary trailing comma before \")\""),
LintViolation(6, 17, "Unnecessary trailing comma before \")\"")
).isFormattedAs(formattedCode)
}
@Test
fun `Given that the trailing comma is required on declaration site then add it to the parameter list when missing`() {
val code =
"""
data class Foo1(val bar: Int)
data class Foo2(
val bar: Int // The comma should be inserted before the comment
)
data class Foo3(
val bar: Int /* The comma should be inserted before the comment */
)
""".trimIndent()
val formattedCode =
"""
data class Foo1(val bar: Int)
data class Foo2(
val bar: Int, // The comma should be inserted before the comment
)
data class Foo3(
val bar: Int, /* The comma should be inserted before the comment */
)
""".trimIndent()
ruleAssertThat(code)
.withEditorConfigOverride(allowTrailingCommaProperty to true)
.hasLintViolations(
LintViolation(3, 17, "Missing trailing comma before \")\""),
LintViolation(6, 17, "Missing trailing comma before \")\"")
).isFormattedAs(formattedCode)
}
@Test
fun `Given that the trailing comma is not allowed on declaration site then remove it from an type parameter list when present`() {
val code =
"""
class Foo1<A, B,> {}
class Foo2<
A,
B, // The comma before the comment should be removed without removing the comment itself
> {}
class Foo3<
A,
B, /* The comma before the comment should be removed without removing the comment itself */
> {}
""".trimIndent()
val formattedCode =
"""
class Foo1<A, B> {}
class Foo2<
A,
B // The comma before the comment should be removed without removing the comment itself
> {}
class Foo3<
A,
B /* The comma before the comment should be removed without removing the comment itself */
> {}
""".trimIndent()
ruleAssertThat(code)
.withEditorConfigOverride(allowTrailingCommaProperty to false)
.hasLintViolations(
LintViolation(1, 16, "Unnecessary trailing comma before \">\""),
LintViolation(4, 6, "Unnecessary trailing comma before \">\""),
LintViolation(8, 6, "Unnecessary trailing comma before \">\"")
).isFormattedAs(formattedCode)
}
@Test
fun `Given that the trailing comma is required on declaration site then add it to the type parameter list when missing`() {
val code =
"""
class Foo1<A, B> {}
class Foo2<
A,
B // The comma should be inserted before the comment
> {}
class Foo3<
A,
B /* The comma should be inserted before the comment */
> {}
""".trimIndent()
val formattedCode =
"""
class Foo1<A, B> {}
class Foo2<
A,
B, // The comma should be inserted before the comment
> {}
class Foo3<
A,
B, /* The comma should be inserted before the comment */
> {}
""".trimIndent()
ruleAssertThat(code)
.withEditorConfigOverride(allowTrailingCommaProperty to true)
.hasLintViolations(
LintViolation(4, 6, "Missing trailing comma before \">\""),
LintViolation(8, 6, "Missing trailing comma before \">\"")
).isFormattedAs(formattedCode)
}
@Test
fun `Given that the trailing comma is not allowed on declaration site then remove it from when-condition when present`() {
val code =
"""
fun foo(bar: Int): String = when(bar) {
1, 2, -> "a"
3, 4, // The comma before the comment should be removed without removing the comment itself
-> "a"
5,
6, /* The comma before the comment should be removed without removing the comment itself */
-> "a"
else -> "b"
}
""".trimIndent()
val formattedCode =
"""
fun foo(bar: Int): String = when(bar) {
1, 2 -> "a"
3, 4 // The comma before the comment should be removed without removing the comment itself
-> "a"
5,
6 /* The comma before the comment should be removed without removing the comment itself */
-> "a"
else -> "b"
}
""".trimIndent()
ruleAssertThat(code)
.withEditorConfigOverride(allowTrailingCommaProperty to false)
.hasLintViolations(
LintViolation(2, 9, "Unnecessary trailing comma before \"->\""),
LintViolation(3, 9, "Unnecessary trailing comma before \"->\""),
LintViolation(6, 6, "Unnecessary trailing comma before \"->\"")
).isFormattedAs(formattedCode)
}
@Test
fun `Given that the trailing comma is required on declaration site then add it to the when-condition when missing`() {
val code =
"""
fun foo(bar: Int): String = when(bar) {
1, 2 -> "a"
3, 4 // The comma should be inserted before the comment
-> "a"
5,
6 /* The comma should be inserted before the comment */
-> "a"
else -> "b"
}
""".trimIndent()
val formattedCode =
"""
fun foo(bar: Int): String = when(bar) {
1, 2 -> "a"
3, 4, // The comma should be inserted before the comment
-> "a"
5,
6, /* The comma should be inserted before the comment */
-> "a"
else -> "b"
}
""".trimIndent()
ruleAssertThat(code)
.withEditorConfigOverride(allowTrailingCommaProperty to true)
.hasLintViolations(
LintViolation(3, 9, "Missing trailing comma before \"->\""),
LintViolation(6, 6, "Missing trailing comma before \"->\"")
).isFormattedAs(formattedCode)
}
@Test
fun `Given that the trailing comma is not allowed on declaration site then remove it from the destructuring declaration when present`() {
val code =
"""
fun foo() {
fun bar(): Pair<Int, Int> = Pair(1, 2)
val (x, y,) = bar()
val (
x,
y, // The comma before the comment should be removed without removing the comment itself
) = bar()
val (
x,
y, /* The comma before the comment should be removed without removing the comment itself */
) = bar()
}
""".trimIndent()
val formattedCode =
"""
fun foo() {
fun bar(): Pair<Int, Int> = Pair(1, 2)
val (x, y) = bar()
val (
x,
y // The comma before the comment should be removed without removing the comment itself
) = bar()
val (
x,
y /* The comma before the comment should be removed without removing the comment itself */
) = bar()
}
""".trimIndent()
ruleAssertThat(code)
.withEditorConfigOverride(allowTrailingCommaProperty to false)
.hasLintViolations(
LintViolation(4, 14, "Unnecessary trailing comma before \")\""),
LintViolation(7, 10, "Unnecessary trailing comma before \")\""),
LintViolation(11, 10, "Unnecessary trailing comma before \")\"")
).isFormattedAs(formattedCode)
}
@Test
fun `Given that the trailing comma is required on declaration site then add it to the destructuring declaration when missing`() {
val code =
"""
fun foo() {
fun bar(): Pair<Int, Int> = Pair(1, 2)
val (x, y) = bar()
val (
x,
y // The comma should be inserted before the comment
) = bar()
val (
x,
y /* The comma should be inserted before the comment */
) = bar()
}
""".trimIndent()
val formattedCode =
"""
fun foo() {
fun bar(): Pair<Int, Int> = Pair(1, 2)
val (x, y) = bar()
val (
x,
y, // The comma should be inserted before the comment
) = bar()
val (
x,
y, /* The comma should be inserted before the comment */
) = bar()
}
""".trimIndent()
ruleAssertThat(code)
.withEditorConfigOverride(allowTrailingCommaProperty to true)
.hasLintViolations(
LintViolation(7, 10, "Missing trailing comma before \")\""),
LintViolation(11, 10, "Missing trailing comma before \")\"")
).isFormattedAs(formattedCode)
}
@Test
fun `Given that the trailing comma is not allowed on declaration site then remove it from the function literal when present`() {
val code =
"""
val fooBar1: (Int, Int) -> Int = { foo, bar, -> foo * bar }
val fooBar2: (Int, Int) -> Int = {
foo,
bar, // The comma before the comment should be removed without removing the comment itself
-> foo * bar
}
val fooBar3: (Int, Int) -> Int = {
foo,
bar, /* The comma before the comment should be removed without removing the comment itself */
-> foo * bar
}
""".trimIndent()
val formattedCode =
"""
val fooBar1: (Int, Int) -> Int = { foo, bar -> foo * bar }
val fooBar2: (Int, Int) -> Int = {
foo,
bar // The comma before the comment should be removed without removing the comment itself
-> foo * bar
}
val fooBar3: (Int, Int) -> Int = {
foo,
bar /* The comma before the comment should be removed without removing the comment itself */
-> foo * bar
}
""".trimIndent()
ruleAssertThat(code)
.withEditorConfigOverride(allowTrailingCommaProperty to false)
.hasLintViolations(
LintViolation(1, 44, "Unnecessary trailing comma before \"->\""),
LintViolation(4, 12, "Unnecessary trailing comma before \"->\""),
LintViolation(9, 12, "Unnecessary trailing comma before \"->\"")
).isFormattedAs(formattedCode)
}
@Test
fun `Given that the trailing comma is required on declaration site then add it to function literal when missing`() {
val code =
"""
val fooBar1: (Int, Int) -> Int = { foo, bar -> foo * bar }
val fooBar2: (Int, Int) -> Int = {
foo,
bar // The comma should be inserted before the comment
-> foo * bar
}
val fooBar3: (Int, Int) -> Int = {
foo,
bar /* The comma should be inserted before the comment */
-> foo * bar
}
""".trimIndent()
val formattedCode =
"""
val fooBar1: (Int, Int) -> Int = { foo, bar -> foo * bar }
val fooBar2: (Int, Int) -> Int = {
foo,
bar, // The comma should be inserted before the comment
-> foo * bar
}
val fooBar3: (Int, Int) -> Int = {
foo,
bar, /* The comma should be inserted before the comment */
-> foo * bar
}
""".trimIndent()
ruleAssertThat(code)
.withEditorConfigOverride(allowTrailingCommaProperty to true)
.hasLintViolations(
LintViolation(4, 12, "Missing trailing comma before \"->\""),
LintViolation(9, 12, "Missing trailing comma before \"->\"")
).isFormattedAs(formattedCode)
}
@Test
fun `Given that a trailing comma is required on declaration site then add it to function declaration`() {
val code =
"""
fun test(
x: Int,
y: Int,
block: (Int, Int) -> Int
): (
Int, Int
) -> Int = { foo, bar ->
block(foo, bar)
}
""".trimIndent()
val formattedCode =
"""
fun test(
x: Int,
y: Int,
block: (Int, Int) -> Int,
): (
Int, Int,
) -> Int = { foo, bar ->
block(foo, bar)
}
""".trimIndent()
ruleAssertThat(code)
.withEditorConfigOverride(allowTrailingCommaProperty to true)
.hasLintViolations(
LintViolation(4, 29, "Missing trailing comma before \")\""),
LintViolation(6, 13, "Missing trailing comma before \")\""),
).isFormattedAs(formattedCode)
}
@Test
fun `Given that a trailing comma is required on declaration site then still it should not be added to the setter`() {
val code =
"""
class Test {
var foo = Bar()
set(value) {
}
}
""".trimIndent()
ruleAssertThat(code)
.withEditorConfigOverride(allowTrailingCommaProperty to true)
.hasNoLintViolations()
}
@Test
fun `Issue 1312 - Given that a trailing comma is required on declaration site and multiple elements then force lambda arrow to next line`() {
val code =
"""
fun foo(bar: Int): String = when(bar) {
1, 2 -> "a"
3,
4 -> "b"
5,
6-> "c"
else -> "d"
}
""".trimIndent()
val formattedCode =
"""
fun foo(bar: Int): String = when(bar) {
1, 2 -> "a"
3,
4,
-> "b"
5,
6,
-> "c"
else -> "d"
}
""".trimIndent()
ruleAssertThat(code)
.withEditorConfigOverride(allowTrailingCommaProperty to true)
.hasLintViolations(
LintViolation(4, 6, "Missing trailing comma and newline before \"->\""),
LintViolation(6, 6, "Missing trailing comma and newline before \"->\"")
).isFormattedAs(formattedCode)
}
@Test
fun `Given that a trailing comma is required on declaration site and unused imports do not affect each other`() {
val code =
"""
package com.pinterest.ktlint
import com.pinterest.ktlint.enum.Enum
import com.pinterest.ktlint.enum.EnumThree
import com.pinterest.ktlint.enum.EnumTwo
data class TrailingCommaTest(
val foo: String,
val bar: Enum,
val bar2: EnumTwo,
val bar3: EnumThree
)
""".trimIndent()
val formattedCode =
"""
package com.pinterest.ktlint
import com.pinterest.ktlint.enum.Enum
import com.pinterest.ktlint.enum.EnumThree
import com.pinterest.ktlint.enum.EnumTwo
data class TrailingCommaTest(
val foo: String,
val bar: Enum,
val bar2: EnumTwo,
val bar3: EnumThree,
)
""".trimIndent()
ruleAssertThat(code)
// When running format mode, the rules are first executed in parallel to find linting errors. In this
// process, no unused import are found because the trailing comma is not yet added to variable "bar3". Then
// in the next stage the rules are run consecutively. Now the trailing comma rule is adding a trailing comma
// after the type of variable "bar3". When the no-unused-import rule runs after the trailing-comma rule, it
// was incorrectly seen as part of the type of variable "bar3" and a reference "EnumThree," (with the
// trailing comma was added) which in turn resulted in not recognizing that the import of EnumThree actually
// was used.
.addAdditionalRuleProvider { NoUnusedImportsRule() }
.withEditorConfigOverride(allowTrailingCommaProperty to true)
.hasLintViolation(9, 24, "Missing trailing comma before \")\"")
.isFormattedAs(formattedCode)
}
}