azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor: extract new line allowance check

Browse Source
This commit is contained in:
Yan Zhulanow
2020-05-28 20:22:28 +09:00
parent 25787eb869
commit e2f0b76e2f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/TrailingCommaInspection.kt
+7 -3
View File
@@ -63,9 +63,8 @@ class TrailingCommaInspection(
} }
val last = TrailingCommaHelper.elementAfterLastElement(commaOwner) val last = TrailingCommaHelper.elementAfterLastElement(commaOwner)
val whenEntryWithoutTrailingComma =
commaOwner is KtWhenEntry && TrailingCommaHelper.trailingCommaOrLastElement(commaOwner)?.isComma != true if (last?.prevLeaf(true)?.isLineBreak() == false && !allowMissingLineBreak(commaOwner)) {
if (last?.prevLeaf(true)?.isLineBreak() == false && !whenEntryWithoutTrailingComma) {
registerProblemForLineBreak( registerProblemForLineBreak(
commaOwner, commaOwner,
last, last,
@@ -74,6 +73,11 @@ class TrailingCommaInspection(
} }
} }
private fun allowMissingLineBreak(commaOwner: KtElement): Boolean {
return commaOwner is KtWhenEntry
&& TrailingCommaHelper.trailingCommaOrLastElement(commaOwner)?.isComma != true
}
private fun checkCommaPosition(commaOwner: KtElement) { private fun checkCommaPosition(commaOwner: KtElement) {
for (invalidComma in TrailingCommaHelper.findInvalidCommas(commaOwner)) { for (invalidComma in TrailingCommaHelper.findInvalidCommas(commaOwner)) {
reportProblem( reportProblem(