Allow comments immediately preceding catch clauses in try-catch expre…

…ssions
hovinen · Nov 17, 2020 · 5757959 · 5757959
1 parent 13ab75c
commit 5757959
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 3 deletions.
diff --git a/formatter/src/main/kotlin/org/kotlin/formatter/scanning/TryScanner.kt b/formatter/src/main/kotlin/org/kotlin/formatter/scanning/TryScanner.kt
@@ -27,10 +27,13 @@ internal class TryScanner(private val kotlinScanner: KotlinScanner) : NodeScanne
                 blockPattern.matchSequence(nodes.first().children().asIterable())
             }
             oneOrMore {
-                possibleWhitespace()
+                either {
+                    possibleWhitespace() thenMapToTokens { listOf(ClosingForcedBreakToken) }
+                    comment()
+                    possibleWhitespace() thenMapToTokens { listOf(ClosingForcedBreakToken) }
+                } or { possibleWhitespace() thenMapToTokens { listOf(nonBreakingSpaceToken()) } }
                 nodeOfType(KtNodeTypes.CATCH) thenMapToTokens { nodes ->
-                    listOf(nonBreakingSpaceToken())
-                        .plus(catchPattern.matchSequence(nodes.first().children().asIterable()))
+                    catchPattern.matchSequence(nodes.first().children().asIterable())
                 }
             }
             end()

diff --git a/formatter/src/test/kotlin/org/kotlin/formatter/KotlinFormatterTest.kt b/formatter/src/test/kotlin/org/kotlin/formatter/KotlinFormatterTest.kt
@@ -3038,6 +3038,36 @@ class KotlinFormatterTest {
             )
     }
 
+    @Test
+    fun `handles comments before a catch clause`() {
+        val result =
+            KotlinFormatter(maxLineLength = 40)
+                .format(
+                    """
+                        try {
+                            aFunction()
+                        }
+                        // A comment
+                        catch (e: Exception) {
+                            anotherFunction()
+                        }
+                    """.trimIndent()
+                )
+
+        assertThat(result)
+            .isEqualTo(
+                """
+                    try {
+                        aFunction()
+                    }
+                    // A comment
+                    catch (e: Exception) {
+                        anotherFunction()
+                    }
+                """.trimIndent()
+            )
+    }
+
     @Test
     fun `breaks before try expression inside function literal`() {
         val result =