Commit a702f58
authored
Update trailing commas rule to apply to all multi-element comma-separated lists (#323)
#### Summary
This PR updates the trailing commas rule to apply to all comma-separated
lists, including function calls and function declarations.
```swift
let terrestrialPlanets = [
mercury,
venus,
earth,
mars,
]
func buildSolarSystem(
innerPlanets: [Planet],
outerPlanets: [Planet],
) { ... }
buildSolarSystem(
innertPlanets: terrestrialPlanets,
outerPlanets: gasGiants,
)
```
This PR also refines the rule to omit the trailing comma if the list
only contains a single element. We feel this is especially the right
choice in function calls with only a single argument, where the trailing
commas adds unnecessary noise:
```swift
// WRONG
let planetsWithLife = [
earth,
]
func buildSolarSystem(
_ planets: [Planet],
)
buildSolarSystem(
terrestrialPlanets + gasGiants,
)
// RIGHT
let planetsWithLife = [
earth
]
func buildSolarSystem(
_ planets: [Planet]
) { ... }
buildSolarSystem(
terrestrialPlanets + gasGiants
)
```
<!--- required --->1 parent ad689bf commit a702f58
File tree
4 files changed
+68
-16
lines changed- Plugins/FormatSwift
- Sources/AirbnbSwiftFormatTool
4 files changed
+68
-16
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
| 8 | + | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
| 11 | + | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
35 | | - | |
| 35 | + | |
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
209 | 209 | | |
210 | 210 | | |
211 | 211 | | |
212 | | - | |
| 212 | + | |
213 | 213 | | |
214 | 214 | | |
215 | 215 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
526 | 526 | | |
527 | 527 | | |
528 | 528 | | |
529 | | - | |
| 529 | + | |
530 | 530 | | |
531 | 531 | | |
532 | 532 | | |
533 | 533 | | |
534 | 534 | | |
535 | | - | |
536 | | - | |
537 | | - | |
538 | | - | |
| 535 | + | |
| 536 | + | |
| 537 | + | |
| 538 | + | |
| 539 | + | |
539 | 540 | | |
540 | 541 | | |
| 542 | + | |
| 543 | + | |
| 544 | + | |
| 545 | + | |
| 546 | + | |
| 547 | + | |
| 548 | + | |
| 549 | + | |
| 550 | + | |
| 551 | + | |
541 | 552 | | |
542 | | - | |
543 | | - | |
544 | | - | |
545 | | - | |
| 553 | + | |
| 554 | + | |
| 555 | + | |
| 556 | + | |
| 557 | + | |
| 558 | + | |
| 559 | + | |
| 560 | + | |
| 561 | + | |
| 562 | + | |
| 563 | + | |
| 564 | + | |
| 565 | + | |
| 566 | + | |
| 567 | + | |
| 568 | + | |
| 569 | + | |
| 570 | + | |
| 571 | + | |
| 572 | + | |
| 573 | + | |
| 574 | + | |
546 | 575 | | |
| 576 | + | |
| 577 | + | |
| 578 | + | |
| 579 | + | |
| 580 | + | |
| 581 | + | |
| 582 | + | |
| 583 | + | |
| 584 | + | |
| 585 | + | |
| 586 | + | |
| 587 | + | |
| 588 | + | |
| 589 | + | |
| 590 | + | |
| 591 | + | |
| 592 | + | |
| 593 | + | |
| 594 | + | |
| 595 | + | |
| 596 | + | |
547 | 597 | | |
548 | 598 | | |
| 599 | + | |
| 600 | + | |
549 | 601 | | |
550 | 602 | | |
551 | 603 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
0 commit comments