Treat array access expressions as blocks.

Otherwise, the formatter may prefer to insert a line break in the middle of such an expression, which is not right. Fixes #19
hovinen · Mar 17, 2021 · 600dd7c · 600dd7c
1 parent 00e6b83
commit 600dd7c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/formatter/src/main/kotlin/org/kotlin/formatter/scanning/NodeScanner.kt b/formatter/src/main/kotlin/org/kotlin/formatter/scanning/NodeScanner.kt
@@ -126,7 +126,8 @@ internal class NodeScannerProvider(
                 KtNodeTypes.VALUE_PARAMETER, KtNodeTypes.SUPER_TYPE_ENTRY,
                 KtNodeTypes.SUPER_TYPE_CALL_ENTRY, KtNodeTypes.USER_TYPE,
                 KtNodeTypes.BINARY_WITH_TYPE, KtNodeTypes.DELEGATED_SUPER_TYPE_ENTRY,
-                KtNodeTypes.IS_EXPRESSION -> simpleBlockScanner.value
+                KtNodeTypes.IS_EXPRESSION, KtNodeTypes.ARRAY_ACCESS_EXPRESSION ->
+                simpleBlockScanner.value
             KtNodeTypes.SHORT_STRING_TEMPLATE_ENTRY, KtNodeTypes.LONG_STRING_TEMPLATE_ENTRY ->
                 stringTemplateEntryScanner.value
             else -> simpleScanner.value

diff --git a/formatter/src/test/kotlin/org/kotlin/formatter/KotlinFormatterTest.kt b/formatter/src/test/kotlin/org/kotlin/formatter/KotlinFormatterTest.kt
@@ -427,6 +427,20 @@ class KotlinFormatterTest {
             )
     }
 
+    @Test
+    fun `prefers not to break within array access expression`() {
+        val result =
+            KotlinFormatter(maxLineLength = 35)
+                .format("fun aFunction(): String = m[one to two]")
+
+        assertThat(result).isEqualTo(
+            """
+                fun aFunction(): String =
+                    m[one to two]
+            """.trimIndent()
+        )
+    }
+
     @Test
     fun `prefers to break before beginning of function literal`() {
         val result =