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

FirRenderer: partially get rid of RenderMode

Browse Source
This commit is contained in:
Mikhail Glukhikh
2022-07-06 17:03:09 +02:00
committed by Space
parent 9890066b72
commit 7c27e6f843
29 changed files with 254 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirAnnotationRenderer.kt
+6 -1
View File
@@ -12,7 +12,12 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
import org.jetbrains.kotlin.fir.references.FirErrorNamedReference
import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
open class FirAnnotationRenderer internal constructor(components: FirRendererComponents) : FirRendererComponents by components {
open class FirAnnotationRenderer {
internal lateinit var components: FirRendererComponents
protected val visitor get() = components.visitor
protected val printer get() = components.printer
fun render(annotationContainer: FirAnnotationContainer) {
renderAnnotations(annotationContainer.annotations)
}
compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirAnnotationWithArgumentsRenderer.kt
+1 -1
View File
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.fir.FirElement
import org.jetbrains.kotlin.fir.expressions.FirAnnotation
import org.jetbrains.kotlin.name.Name
class FirAnnotationWithArgumentsRenderer internal constructor(components: FirRendererComponents) : FirAnnotationRenderer(components) {
class FirAnnotationWithArgumentsRenderer() : FirAnnotationRenderer() {
override fun FirAnnotation.renderArgumentMapping() {
printer.print("(")
argumentMapping.mapping.renderSeparated()
compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirBodyRenderer.kt
+19 -1
View File
@@ -7,10 +7,17 @@ package org.jetbrains.kotlin.fir.renderer
import org.jetbrains.kotlin.fir.declarations.FirFunction
import org.jetbrains.kotlin.fir.expressions.FirBlock
import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall
import org.jetbrains.kotlin.fir.expressions.FirStatement
import org.jetbrains.kotlin.fir.expressions.impl.FirLazyBlock
class FirBodyRenderer internal constructor(components: FirRendererComponents) : FirRendererComponents by components {
class FirBodyRenderer {
internal lateinit var components: FirRendererComponents
private val annotationRenderer get() = components.annotationRenderer
private val visitor get() = components.visitor
private val printer get() = components.printer
fun render(function: FirFunction) {
renderBody(function.body)
@@ -33,4 +40,15 @@ class FirBodyRenderer internal constructor(components: FirRendererComponents) :
}
}
}
fun renderDelegatedConstructor(delegatedConstructor: FirDelegatedConstructorCall?) {
if (delegatedConstructor != null) {
printer.renderInBraces {
delegatedConstructor.accept(visitor)
printer.println()
}
} else {
printer.println()
}
}
}
compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirClassMemberRenderer.kt
+28
View File
@@ -0,0 +1,28 @@
/*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.fir.renderer
import org.jetbrains.kotlin.fir.declarations.FirDeclaration
import org.jetbrains.kotlin.fir.declarations.FirRegularClass
open class FirClassMemberRenderer {
internal lateinit var components: FirRendererComponents
protected val visitor get() = components.visitor
protected val printer get() = components.printer
open fun render(regularClass: FirRegularClass) {
render(regularClass.declarations)
}
open fun render(declarations: List<FirDeclaration>) {
printer.renderInBraces {
for (declaration in declarations) {
declaration.accept(visitor)
printer.println()
}
}
}
}
compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirDeclarationRenderer.kt
+5 -1
View File
@@ -7,7 +7,11 @@ package org.jetbrains.kotlin.fir.renderer
import org.jetbrains.kotlin.fir.declarations.FirDeclaration
open class FirDeclarationRenderer internal constructor(components: FirRendererComponents) : FirRendererComponents by components {
open class FirDeclarationRenderer {
internal lateinit var components: FirRendererComponents
protected val printer get() = components.printer
fun render(declaration: FirDeclaration) {
with(declaration) {
renderDeclarationResolvePhase()
compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirDeclarationRendererWithAttributes.kt
+1 -1
View File
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol
import kotlin.reflect.KClass
open class FirDeclarationRendererWithAttributes internal constructor(components: FirRendererComponents) : FirDeclarationRenderer(components) {
open class FirDeclarationRendererWithAttributes : FirDeclarationRenderer() {
override fun FirDeclaration.renderDeclarationAttributes() {
if (attributes.isNotEmpty()) {
val attributes = getAttributesWithValues().mapNotNull { (klass, value) ->
compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirDeclarationRendererWithAttributesAndResolvePhase.kt
+1 -3
View File
@@ -7,9 +7,7 @@ package org.jetbrains.kotlin.fir.renderer
import org.jetbrains.kotlin.fir.declarations.FirDeclaration
class FirDeclarationRendererWithAttributesAndResolvePhase internal constructor(
components: FirRendererComponents
) : FirDeclarationRendererWithAttributes(components) {
class FirDeclarationRendererWithAttributesAndResolvePhase : FirDeclarationRendererWithAttributes() {
override fun FirDeclaration.renderDeclarationResolvePhase() {
printer.print("[${resolvePhase}] ")
}
compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirDeclarationRendererWithResolvePhase.kt
+1 -1
View File
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.renderer
import org.jetbrains.kotlin.fir.declarations.FirDeclaration
class FirDeclarationRendererWithResolvePhase internal constructor(components: FirRendererComponents) : FirDeclarationRenderer(components) {
class FirDeclarationRendererWithResolvePhase : FirDeclarationRenderer() {
override fun FirDeclaration.renderDeclarationResolvePhase() {
printer.print("[${resolvePhase}] ")
}
compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirNoClassMemberRenderer.kt
+17
View File
@@ -0,0 +1,17 @@
/*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.fir.renderer
import org.jetbrains.kotlin.fir.declarations.FirDeclaration
import org.jetbrains.kotlin.fir.declarations.FirRegularClass
class FirNoClassMemberRenderer : FirClassMemberRenderer() {
override fun render(regularClass: FirRegularClass) {
}
override fun render(declarations: List<FirDeclaration>) {
}
}
compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirPackageDirectiveRenderer.kt
+6 -1
View File
@@ -7,7 +7,12 @@ package org.jetbrains.kotlin.fir.renderer
import org.jetbrains.kotlin.fir.FirPackageDirective
class FirPackageDirectiveRenderer internal constructor(components: FirRendererComponents) : FirRendererComponents by components {
class FirPackageDirectiveRenderer {
internal lateinit var components: FirRendererComponents
private val printer get() = components.printer
fun render(packageDirective: FirPackageDirective) {
if (!packageDirective.packageFqName.isRoot) {
printer.println("package ${packageDirective.packageFqName.asString()}")
compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirRenderer.kt
+63 -105
View File
@@ -34,9 +34,15 @@ import org.jetbrains.kotlin.utils.addToStdlib.safeAs
import java.util.*
open class FirRenderer private constructor(
builder: StringBuilder,
private val builder: StringBuilder,
protected val mode: RenderMode,
components: FirComponentsImpl
components: FirComponentsImpl,
private val annotationRenderer: FirAnnotationRenderer?,
private val bodyRenderer: FirBodyRenderer?,
private val classMemberRenderer: FirClassMemberRenderer,
private val declarationRenderer: FirDeclarationRenderer,
private val packageDirectiveRenderer: FirPackageDirectiveRenderer?,
private val typeRenderer: ConeTypeRenderer
) : FirPrinter(builder) {
companion object {
@@ -46,8 +52,57 @@ open class FirRenderer private constructor(
)
}
private val visitor = Visitor()
init {
components.visitor = visitor
components.annotationRenderer = annotationRenderer
components.bodyRenderer = bodyRenderer
components.classMemberRenderer = classMemberRenderer
components.declarationRenderer = declarationRenderer
components.packageDirectiveRenderer = packageDirectiveRenderer
components.typeRenderer = typeRenderer
@Suppress("LeakingThis")
components.printer = this
annotationRenderer?.components = components
bodyRenderer?.components = components
classMemberRenderer.components = components
declarationRenderer.components = components
packageDirectiveRenderer?.components = components
typeRenderer.builder = builder
}
private constructor(
builder: StringBuilder,
mode: RenderMode,
components: FirComponentsImpl,
) : this(
builder,
mode,
components,
FirAnnotationWithArgumentsRenderer(),
FirBodyRenderer(),
FirClassMemberRenderer(),
FirDeclarationRenderer(),
packageDirectiveRenderer = null,
ConeTypeRendererForDebugging(),
)
constructor(builder: StringBuilder = StringBuilder(), mode: RenderMode = RenderMode.Normal) : this(builder, mode, FirComponentsImpl())
fun with(
annotationRenderer: FirAnnotationRenderer? = this.annotationRenderer,
bodyRenderer: FirBodyRenderer? = this.bodyRenderer,
classMemberRenderer: FirClassMemberRenderer = this.classMemberRenderer,
declarationRenderer: FirDeclarationRenderer = this.declarationRenderer,
packageDirectiveRenderer: FirPackageDirectiveRenderer? = this.packageDirectiveRenderer,
typeRenderer: ConeTypeRenderer = this.typeRenderer
): FirRenderer = FirRenderer(
builder, mode, FirComponentsImpl(),
annotationRenderer, bodyRenderer, classMemberRenderer,
declarationRenderer, packageDirectiveRenderer, typeRenderer
)
fun renderElementAsString(element: FirElement): String {
element.accept(visitor)
return toString()
@@ -69,6 +124,8 @@ open class FirRenderer private constructor(
override var packageDirectiveRenderer: FirPackageDirectiveRenderer? = null
override lateinit var classMemberRenderer: FirClassMemberRenderer
override lateinit var declarationRenderer: FirDeclarationRenderer
override lateinit var typeRenderer: ConeTypeRenderer
@@ -81,118 +138,37 @@ open class FirRenderer private constructor(
data class RenderMode(
val renderCallArguments: Boolean,
val renderCallableFqNames: Boolean,
val renderDeclarationResolvePhase: Boolean,
val renderAnnotation: Boolean,
val renderBodies: Boolean = true,
val renderPropertyAccessors: Boolean = true,
val renderDeclarationAttributes: Boolean = false,
val renderPackageDirective: Boolean = false,
val renderNestedDeclarations: Boolean = true,
val renderDefaultParameterValues: Boolean = true,
val renderDetailedTypeReferences: Boolean = true,
val renderAllModifiers: Boolean = true,
) {
companion object {
val Normal = RenderMode(
renderCallArguments = true,
renderCallableFqNames = false,
renderDeclarationResolvePhase = false,
renderAnnotation = true,
)
val WithFqNames = RenderMode(
renderCallArguments = true,
renderCallableFqNames = true,
renderDeclarationResolvePhase = false,
renderAnnotation = true,
)
val WithFqNamesExceptAnnotationAndBody = RenderMode(
renderCallArguments = true,
renderCallableFqNames = true,
renderDeclarationResolvePhase = false,
renderAnnotation = false,
renderBodies = false,
)
val WithResolvePhases = RenderMode(
renderCallArguments = true,
renderCallableFqNames = false,
renderDeclarationResolvePhase = true,
renderAnnotation = true,
)
val NoBodies = RenderMode(
renderCallArguments = false,
renderCallableFqNames = false,
renderDeclarationResolvePhase = false,
renderAnnotation = false,
renderBodies = false,
renderPropertyAccessors = false,
)
val DeclarationHeader = RenderMode(
renderCallArguments = false,
renderCallableFqNames = false,
renderDeclarationResolvePhase = false,
renderAnnotation = true,
renderBodies = false,
renderPropertyAccessors = false,
renderDeclarationAttributes = false,
renderPackageDirective = false,
renderNestedDeclarations = false,
renderDefaultParameterValues = false,
renderDetailedTypeReferences = false,
renderAllModifiers = false,
)
val WithDeclarationAttributes = RenderMode(
renderCallArguments = true,
renderCallableFqNames = false,
renderDeclarationResolvePhase = false,
renderAnnotation = true,
renderDeclarationAttributes = true,
)
}
}
private val visitor = Visitor()
private val annotationRenderer = when {
mode.renderAnnotation ->
if (mode.renderCallArguments) FirAnnotationWithArgumentsRenderer(components) else FirAnnotationRenderer(components)
else ->
null
}
private val bodyRenderer =
if (mode.renderBodies) FirBodyRenderer(components) else null
private val declarationRenderer = when {
mode.renderDeclarationAttributes && mode.renderDeclarationResolvePhase ->
FirDeclarationRendererWithAttributesAndResolvePhase(components)
mode.renderDeclarationAttributes ->
FirDeclarationRendererWithAttributes(components)
mode.renderDeclarationResolvePhase ->
FirDeclarationRendererWithResolvePhase(components)
else -> FirDeclarationRenderer(components)
}
private val packageDirectiveRenderer = if (mode.renderPackageDirective) FirPackageDirectiveRenderer(components) else null
@Suppress("LeakingThis")
private val typeRenderer =
if (mode.renderDetailedTypeReferences) ConeTypeRendererForDebugging(builder) else ConeTypeRenderer(builder)
init {
components.visitor = visitor
components.annotationRenderer = annotationRenderer
components.bodyRenderer = bodyRenderer
components.declarationRenderer = declarationRenderer
components.packageDirectiveRenderer = packageDirectiveRenderer
components.typeRenderer = typeRenderer
@Suppress("LeakingThis")
components.printer = this
}
private fun List<FirElement>.renderSeparated() {
for ((index, element) in this.withIndex()) {
if (index > 0) {
@@ -291,15 +267,6 @@ open class FirRenderer private constructor(
}
}
protected fun List<FirDeclaration>.renderDeclarations() {
renderInBraces {
for (declaration in this) {
declaration.accept(visitor)
println()
}
}
}
fun renderSupertypes(regularClass: FirRegularClass) {
if (regularClass.superTypeRefs.isNotEmpty()) {
print(" : ")
@@ -312,9 +279,7 @@ open class FirRenderer private constructor(
}
protected open fun renderClassDeclarations(regularClass: FirRegularClass) {
if (mode.renderNestedDeclarations) {
regularClass.declarations.renderDeclarations()
}
classMemberRenderer.render(regularClass)
}
private fun visitAssignment(operation: FirOperation, rValue: FirExpression) {
@@ -526,7 +491,7 @@ open class FirRenderer private constructor(
annotationRenderer?.render(anonymousObject)
print("object : ")
anonymousObject.superTypeRefs.renderSeparated()
anonymousObject.declarations.renderDeclarations()
classMemberRenderer.render(anonymousObject.declarations)
}
override fun visitVariable(variable: FirVariable) {
@@ -614,15 +579,8 @@ open class FirRenderer private constructor(
constructor.returnTypeRef.accept(this)
val body = constructor.body
val delegatedConstructor = constructor.delegatedConstructor
if (body == null && mode.renderBodies) {
if (delegatedConstructor != null) {
renderInBraces {
delegatedConstructor.accept(this)
println()
}
} else {
println()
}
if (body == null) {
bodyRenderer?.renderDelegatedConstructor(delegatedConstructor)
}
bodyRenderer?.renderBody(body, listOfNotNull<FirStatement>(delegatedConstructor))
}
compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirRendererComponents.kt
+1
View File
@@ -11,6 +11,7 @@ internal interface FirRendererComponents {
val declarationRenderer: FirDeclarationRenderer
val annotationRenderer: FirAnnotationRenderer?
val bodyRenderer: FirBodyRenderer?
val classMemberRenderer: FirClassMemberRenderer
val packageDirectiveRenderer: FirPackageDirectiveRenderer?
val typeRenderer: ConeTypeRenderer
}