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

FIR visibility rendering: unknown -> public with question

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-03-21 12:53:37 +03:00
parent b83d921445
commit 737ec37486
28 changed files with 153 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
+11 -3
View File
@@ -5,6 +5,8 @@
package org.jetbrains.kotlin.fir
import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.descriptors.Visibility
import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.expressions.*
import org.jetbrains.kotlin.fir.types.*
@@ -98,6 +100,12 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
callableMember.returnType.accept(this)
}
private fun Visibility.asString() =
when (this) {
Visibilities.UNKNOWN -> "public?"
else -> toString()
}
override fun visitMemberDeclaration(memberDeclaration: FirMemberDeclaration) {
memberDeclaration.annotations.renderAnnotations()
if (memberDeclaration.typeParameters.isNotEmpty()) {
@@ -105,7 +113,7 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
memberDeclaration.typeParameters.renderSeparated()
print("> ")
}
print(memberDeclaration.visibility.toString() + " " + memberDeclaration.modality.name.toLowerCase() + " ")
print(memberDeclaration.visibility.asString() + " " + memberDeclaration.modality.name.toLowerCase() + " ")
if (memberDeclaration is FirCallableMember && memberDeclaration.isOverride) {
print("override ")
}
@@ -217,7 +225,7 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
override fun visitConstructor(constructor: FirConstructor) {
constructor.annotations.renderAnnotations()
print(constructor.visibility.toString() + " constructor")
print(constructor.visibility.asString() + " constructor")
constructor.valueParameters.renderParameters()
constructor.delegatedConstructor?.accept(this)
constructor.body?.accept(this)
@@ -228,7 +236,7 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
override fun visitPropertyAccessor(propertyAccessor: FirPropertyAccessor) {
propertyAccessor.annotations.renderAnnotations()
print(propertyAccessor.visibility.toString() + " ")
print(propertyAccessor.visibility.asString() + " ")
print(if (propertyAccessor.isGetter) "get" else "set")
propertyAccessor.valueParameters.renderParameters()
print(": ")