Skip to content

Extend the ExpressionFormatter to handle all basic expression types #679

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: abdullin/call-formatter
Choose a base branch
from
Open

Extend the ExpressionFormatter to handle all basic expression types #679

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
2fec16d
Extract CallFormatter
AbdullinAM Aug 18, 2026
afa90e8
Introduce custom Indentation as a wrapper for GJF's `Indent` to simpl…
AbdullinAM Aug 18, 2026
ff78668
Refactor `emitQualifiedExpression`
AbdullinAM Aug 18, 2026
bfaf519
Refactor `formatLambdaExpression`
AbdullinAM Aug 18, 2026
8d30884
Fix API
AbdullinAM Aug 19, 2026
8e3083b
Reformat
AbdullinAM Aug 19, 2026
384d2d0
Fix native image compilation
AbdullinAM Aug 19, 2026
cf7eb51
Review fixes
AbdullinAM Aug 20, 2026
5497671
Introduce `KtCallElement.trailingLambda` util to simplify the logic o…
AbdullinAM Aug 20, 2026
916123f
Extend the `ExpressionFormatter` to handle all basic expression types
AbdullinAM Aug 20, 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
169 changes: 104 additions & 65 deletions core/api/ktfmt.api
View file
Open in desktop

Large diffs are not rendered by default.

1,126 changes: 42 additions & 1,084 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
Loading