From 4d859a7212965b8346bf96addcdb8a3c815e58f2 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Tue, 2 Jun 2020 00:16:45 +0900
Subject: [PATCH] Revert "TrailingCommaInspection: don't report `Missing line
 break` for `when entry` that has no trailing comma"

This reverts commit 25787eb8
---
 .../inspections/TrailingCommaInspection.kt    |  5 +--
 .../inspectionData/expected.xml               | 36 +++++++++++++++++++
 .../inspectionData/expected.xml               | 36 +++++++++++++++++++
 3 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/TrailingCommaInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/TrailingCommaInspection.kt
index 9e0355427a7..956127dd23d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/TrailingCommaInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/TrailingCommaInspection.kt
@@ -26,7 +26,6 @@ import org.jetbrains.kotlin.idea.util.isComma
 import org.jetbrains.kotlin.idea.util.isLineBreak
 import org.jetbrains.kotlin.idea.util.leafIgnoringWhitespaceAndComments
 import org.jetbrains.kotlin.psi.KtElement
-import org.jetbrains.kotlin.psi.KtWhenEntry
 import org.jetbrains.kotlin.psi.psiUtil.*
 import javax.swing.JComponent
 import kotlin.properties.Delegates
@@ -63,9 +62,7 @@ class TrailingCommaInspection(
             }
 
             val last = TrailingCommaHelper.elementAfterLastElement(commaOwner)
-            val whenEntryWithoutTrailingComma =
-                commaOwner is KtWhenEntry && TrailingCommaHelper.trailingCommaOrLastElement(commaOwner)?.isComma != true
-            if (last?.prevLeaf(true)?.isLineBreak() == false && !whenEntryWithoutTrailingComma) {
+            if (last?.prevLeaf(true)?.isLineBreak() == false) {
                 registerProblemForLineBreak(
                     commaOwner,
                     last,
diff --git a/idea/testData/inspections/trailingCommaOff/inspectionData/expected.xml b/idea/testData/inspections/trailingCommaOff/inspectionData/expected.xml
index fe8295ee01f..3869321c158 100644
--- a/idea/testData/inspections/trailingCommaOff/inspectionData/expected.xml
+++ b/idea/testData/inspections/trailingCommaOff/inspectionData/expected.xml
@@ -5507,6 +5507,18 @@
     <offset>8</offset>
     <length>1</length>
   </problem>
+  <problem>
+    <file>WhenEntry.kt</file>
+    <line>15</line>
+    <module>testProject</module>
+    <package>light_idea_test_case</package>
+    <entry_point TYPE="file" FQNAME="WhenEntry.kt" />
+    <problem_class severity="INFO" attribute_key="INFO_ATTRIBUTES">Trailing comma recommendations</problem_class>
+    <description>Missing line break</description>
+    <highlighted_element>-</highlighted_element>
+    <offset>44</offset>
+    <length>1</length>
+  </problem>
   <problem>
     <file>WhenEntry.kt</file>
     <line>21</line>
@@ -5543,4 +5555,28 @@
     <offset>9</offset>
     <length>1</length>
   </problem>
+  <problem>
+    <file>WhenEntry.kt</file>
+    <line>54</line>
+    <module>testProject</module>
+    <package>light_idea_test_case</package>
+    <entry_point TYPE="file" FQNAME="WhenEntry.kt" />
+    <problem_class severity="INFO" attribute_key="INFO_ATTRIBUTES">Trailing comma recommendations</problem_class>
+    <description>Missing line break</description>
+    <highlighted_element>-</highlighted_element>
+    <offset>15</offset>
+    <length>1</length>
+  </problem>
+  <problem>
+    <file>WhenEntry.kt</file>
+    <line>62</line>
+    <module>testProject</module>
+    <package>light_idea_test_case</package>
+    <entry_point TYPE="file" FQNAME="WhenEntry.kt" />
+    <problem_class severity="INFO" attribute_key="INFO_ATTRIBUTES">Trailing comma recommendations</problem_class>
+    <description>Missing line break</description>
+    <highlighted_element>-</highlighted_element>
+    <offset>15</offset>
+    <length>1</length>
+  </problem>
 </problems>
\ No newline at end of file
diff --git a/idea/testData/inspections/trailingCommaOn/inspectionData/expected.xml b/idea/testData/inspections/trailingCommaOn/inspectionData/expected.xml
index 4a0810200a5..42cdfcae924 100644
--- a/idea/testData/inspections/trailingCommaOn/inspectionData/expected.xml
+++ b/idea/testData/inspections/trailingCommaOn/inspectionData/expected.xml
@@ -1907,6 +1907,18 @@
     <offset>44</offset>
     <length>1</length>
   </problem>
+  <problem>
+    <file>WhenEntry.kt</file>
+    <line>15</line>
+    <module>testProject</module>
+    <package>light_idea_test_case</package>
+    <entry_point TYPE="file" FQNAME="WhenEntry.kt" />
+    <problem_class severity="INFO" attribute_key="INFO_ATTRIBUTES">Trailing comma recommendations</problem_class>
+    <description>Missing line break</description>
+    <highlighted_element>-</highlighted_element>
+    <offset>44</offset>
+    <length>1</length>
+  </problem>
   <problem>
     <file>WhenEntry.kt</file>
     <line>15</line>
@@ -1967,6 +1979,18 @@
     <offset>8</offset>
     <length>1</length>
   </problem>
+  <problem>
+    <file>WhenEntry.kt</file>
+    <line>54</line>
+    <module>testProject</module>
+    <package>light_idea_test_case</package>
+    <entry_point TYPE="file" FQNAME="WhenEntry.kt" />
+    <problem_class severity="INFO" attribute_key="INFO_ATTRIBUTES">Trailing comma recommendations</problem_class>
+    <description>Missing line break</description>
+    <highlighted_element>-</highlighted_element>
+    <offset>15</offset>
+    <length>1</length>
+  </problem>
   <problem>
     <file>WhenEntry.kt</file>
     <line>54</line>
@@ -1979,6 +2003,18 @@
     <offset>8</offset>
     <length>1</length>
   </problem>
+  <problem>
+    <file>WhenEntry.kt</file>
+    <line>62</line>
+    <module>testProject</module>
+    <package>light_idea_test_case</package>
+    <entry_point TYPE="file" FQNAME="WhenEntry.kt" />
+    <problem_class severity="INFO" attribute_key="INFO_ATTRIBUTES">Trailing comma recommendations</problem_class>
+    <description>Missing line break</description>
+    <highlighted_element>-</highlighted_element>
+    <offset>15</offset>
+    <length>1</length>
+  </problem>
   <problem>
     <file>WhenEntry.kt</file>
     <line>62</line>