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

Revert "Minor: extract new line allowance check"

Browse Source 
This reverts commit e2f0b76e
This commit is contained in:
Yan Zhulanow
2020-06-02 00:16:31 +09:00
parent 1d589e3f56
commit a421f74ef0
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/TrailingCommaInspection.kt
+3 -7
View File
@@ -63,8 +63,9 @@ class TrailingCommaInspection(
} }
val last = TrailingCommaHelper.elementAfterLastElement(commaOwner) val last = TrailingCommaHelper.elementAfterLastElement(commaOwner)
val whenEntryWithoutTrailingComma =
if (last?.prevLeaf(true)?.isLineBreak() == false && !allowMissingLineBreak(commaOwner)) { commaOwner is KtWhenEntry && TrailingCommaHelper.trailingCommaOrLastElement(commaOwner)?.isComma != true
if (last?.prevLeaf(true)?.isLineBreak() == false && !whenEntryWithoutTrailingComma) {
registerProblemForLineBreak( registerProblemForLineBreak(
commaOwner, commaOwner,
last, last,
@@ -73,11 +74,6 @@ 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(