Skip to content

Extract and refactor call formatter #677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AbdullinAM wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Extract and refactor call formatter #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2489ea0
Extract CallFormatter
AbdullinAM Aug 18, 2026
217b2ec
Introduce custom Indentation as a wrapper for GJF's `Indent` to simpl…
AbdullinAM Aug 18, 2026
8df5b17
Refactor `emitQualifiedExpression`
AbdullinAM Aug 18, 2026
a595682
Refactor `formatLambdaExpression`
AbdullinAM Aug 18, 2026
6f69572
Fix API
AbdullinAM Aug 19, 2026
24908ce
Reformat
AbdullinAM Aug 19, 2026
e11c391
Fix native image compilation
AbdullinAM Aug 19, 2026
e56f4ae
Review fixes
AbdullinAM Aug 20, 2026
7d466cc
Introduce `KtCallElement.trailingLambda` util to simplify the logic o…
AbdullinAM Aug 20, 2026
17f48b5
Rebase
AbdullinAM Aug 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/org/jetbrains/ktfmt/NativeImagePlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ class NativeImagePlugin : Plugin<Project> {
add("--future-defaults=all")
add("--link-at-build-time=org.jetbrains.ktfmt")
add("--initialize-at-build-time=org.jetbrains.ktfmt")
add($$"--initialize-at-build-time=com.google.googlejavaformat.Indent$Const")
add("--add-opens=java.base/java.util=ALL-UNNAMED")
add("--color=always")
add("-H:+ReportExceptionStackTraces")
Expand Down
93 changes: 64 additions & 29 deletions core/api/ktfmt.api
View file
Open in desktop

Large diffs are not rendered by default.

764 changes: 37 additions & 727 deletions core/src/main/kotlin/org/jetbrains/ktfmt/format/KotlinInputAstVisitor.kt
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions core/src/main/kotlin/org/jetbrains/ktfmt/format/visitor/AbstractFormatterVisitor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ abstract class AbstractFormatterVisitor : KtTreeVisitorVoid(), KotlinAstFormatte
}

override fun visitArgument(argument: KtValueArgument) {
formatArgument(argument)
formatArgument(argument, wrapInBlock = true, brokeBeforeBrace = null)
}

override fun visitSuperTypeList(list: KtSuperTypeList) {
Expand Down Expand Up @@ -221,7 +221,7 @@ abstract class AbstractFormatterVisitor : KtTreeVisitorVoid(), KotlinAstFormatte
}

override fun visitLambdaExpression(lambdaExpression: KtLambdaExpression) {
formatLambdaExpression(lambdaExpression)
formatLambdaExpression(lambdaExpression, brokeBeforeBrace = null)
}

override fun visitThisExpression(expression: KtThisExpression) {
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/kotlin/org/jetbrains/ktfmt/format/visitor/AnnotationFormatter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package org.jetbrains.ktfmt.format.visitor

import com.google.googlejavaformat.Doc
import com.google.googlejavaformat.Indent.Const.ZERO
import org.jetbrains.kotlin.psi.KtAnnotatedExpression
import org.jetbrains.kotlin.psi.KtAnnotation
import org.jetbrains.kotlin.psi.KtAnnotationEntry
import org.jetbrains.kotlin.psi.KtAnnotationUseSiteTarget
import org.jetbrains.kotlin.psi.KtBlockExpression
import org.jetbrains.kotlin.psi.KtLambdaExpression
import org.jetbrains.kotlin.psi.KtReturnExpression
import org.jetbrains.ktfmt.format.visitor.Indentation.Companion.ZERO

interface AnnotationFormatter : KotlinAstFormatter {
override fun formatAnnotatedExpression(expression: KtAnnotatedExpression) {
Expand Down Expand Up @@ -90,11 +90,11 @@ interface AnnotationFormatter : KotlinAstFormatter {
format(useSiteTarget)
builder.token(":")
}
formatCallElement(
formatFunctionCall(
annotationEntry.calleeExpression,
null, // Type-arguments are included in the annotation's callee expression.
annotationEntry.valueArgumentList,
listOf(),
null,
)
}
}
Loading