Treat this and super expressions the same way as reference expression…

…s for formatting dot-qualified expressions
hovinen · Mar 25, 2021 · b1f8052 · b1f8052
1 parent ed98cd9
commit b1f8052
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/formatter/src/main/kotlin/org/kotlin/formatter/scanning/DotQualifiedExpressionScanner.kt b/formatter/src/main/kotlin/org/kotlin/formatter/scanning/DotQualifiedExpressionScanner.kt
@@ -46,9 +46,11 @@ internal class DotQualifiedExpressionScanner(private val kotlinScanner: KotlinSc
         }
 
     private fun NodePatternBuilder.methodCallOnReferenceExpression() {
-        nodeOfType(KtNodeTypes.REFERENCE_EXPRESSION) thenMapToTokens { nodes ->
-            kotlinScanner.scanNodes(nodes, ScannerState.STATEMENT)
-        }
+        nodeOfOneOfTypes(
+            KtNodeTypes.REFERENCE_EXPRESSION,
+            KtNodeTypes.THIS_EXPRESSION,
+            KtNodeTypes.SUPER_EXPRESSION
+        ) thenMapToTokens { nodes -> kotlinScanner.scanNodes(nodes, ScannerState.STATEMENT) }
         possibleWhitespace()
         dotToken() thenMapToTokens { nodes ->
             listOf(emptyBreakPoint(), LeafNodeToken(nodes.first().text))

diff --git a/formatter/src/test/kotlin/org/kotlin/formatter/KotlinFormatterTest.kt b/formatter/src/test/kotlin/org/kotlin/formatter/KotlinFormatterTest.kt
@@ -3357,6 +3357,33 @@ class KotlinFormatterTest {
             )
     }
 
+    @ParameterizedTest
+    @ValueSource(strings = ["this", "super"])
+    fun `does not break on a single dot expression with keyword`(reference: String) {
+        val result =
+            KotlinFormatter(maxLineLength = 50)
+                .format(
+                    """
+                        fun myFunction() {
+                            $reference.aMethod(aParameter, anotherParameter, aThirdParameter)
+                        }
+                    """.trimIndent()
+                )
+
+        assertThat(result)
+            .isEqualTo(
+                """
+                    fun myFunction() {
+                        $reference.aMethod(
+                            aParameter,
+                            anotherParameter,
+                            aThirdParameter
+                        )
+                    }
+                """.trimIndent()
+            )
+    }
+
     @Test
     fun `breaks at first dot operator in dot expression when necessary`() {
         val result =