azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR generator] Don't print extra space in the where clause

Browse Source
This commit is contained in:
Sergej Jaskiewicz
2023-09-15 15:47:33 +02:00
committed by Space Team
parent 1d0785e246
commit 88c308dfd3
7 changed files with 332 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/element.kt
+1 -1
View File
@@ -75,7 +75,7 @@ fun SmartPrinter.printElement(element: Element) {
)
}
print(multipleUpperBoundsList())
println("{")
println(" {")
withIndent {
allFields.forEach { field ->
if (field.isFinal && field.fromParent || field.isParameter) return@forEach
compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/transformer.kt
+2 -2
View File
@@ -36,7 +36,7 @@ fun printTransformer(elements: List<Element>, generationPath: File): GeneratedFi
element.typeParameters.takeIf { it.isNotBlank() }?.let { print(it) }
println(
"transform${element.name}($varName: ${element.typeWithArguments}, data: D): ${element.transformerType
.typeWithArguments}${element.multipleUpperBoundsList()}{",
.typeWithArguments}${element.multipleUpperBoundsList()} {",
)
withIndent {
println("return transformElement($varName, data)")
@@ -52,7 +52,7 @@ fun printTransformer(elements: List<Element>, generationPath: File): GeneratedFi
println(
"visit${element.name}($varName: ${element.typeWithArguments}, data: D): ${element.transformerType
.typeWithArguments}${element.multipleUpperBoundsList()}{",
.typeWithArguments}${element.multipleUpperBoundsList()} {",
)
withIndent {
println("return transform${element.name}($varName, data)")
compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/utils.kt
+2 -2
View File
@@ -153,11 +153,11 @@ fun Field.call(): String = if (nullable) "?." else "."
fun Element.multipleUpperBoundsList(): String {
return typeArguments.filterIsInstance<TypeArgumentWithMultipleUpperBounds>().takeIf { it.isNotEmpty() }?.let { arguments ->
val upperBoundsList = arguments.joinToString(", ", postfix = " ") { argument ->
val upperBoundsList = arguments.joinToString(", ") { argument ->
argument.upperBounds.joinToString(", ") { upperBound -> "${argument.name} : ${upperBound.typeWithArguments}" }
}
" where $upperBoundsList"
} ?: " "
} ?: ""
}
fun ImplementationKind?.braces(): String = when (this) {
compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/visitor.kt
+2 -2
View File
@@ -98,7 +98,7 @@ fun printVisitorVoid(elements: List<Element>, generationPath: File): GeneratedFi
if (element == AbstractFirTreeBuilder.baseFirElement) continue
with(element) {
val varName = safeDecapitalizedName
println("open fun ${typeParameters}visit$name($varName: $typeWithArguments)${multipleUpperBoundsList()}{")
println("open fun ${typeParameters}visit$name($varName: $typeWithArguments)${multipleUpperBoundsList()} {")
withIndent {
println("visitElement($varName)")
}
@@ -110,7 +110,7 @@ fun printVisitorVoid(elements: List<Element>, generationPath: File): GeneratedFi
for (element in elements) {
with(element) {
val varName = safeDecapitalizedName
println("final override fun ${typeParameters}visit$name($varName: $typeWithArguments, data: Nothing?)${multipleUpperBoundsList()}{")
println("final override fun ${typeParameters}visit$name($varName: $typeWithArguments, data: Nothing?)${multipleUpperBoundsList()} {")
withIndent {
println("visit$name($varName)")
}