FIR IDE: render captured type

This commit is contained in:
Tianyu Geng
2021-10-07 10:56:09 -07:00
committed by Ilya Kirillov
parent 8b44a4685f
commit ba359fb296
6 changed files with 31 additions and 25 deletions
@@ -5,6 +5,8 @@
package org.jetbrains.kotlin.analysis.api.fir.renderer
import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.tryCollectDesignation
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.containingClass
import org.jetbrains.kotlin.fir.containingClassForLocal
@@ -20,8 +22,6 @@ import org.jetbrains.kotlin.fir.resolve.toSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
import org.jetbrains.kotlin.fir.symbols.impl.LookupTagInternals
import org.jetbrains.kotlin.fir.types.*
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.tryCollectDesignation
import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.StandardClassIds
import org.jetbrains.kotlin.renderer.render
@@ -86,6 +86,11 @@ internal class ConeTypeIdeRenderer(
renderAnnotationList(annotations)
append(renderFlexibleType(renderType(type.lowerBound), renderType(type.upperBound)))
}
is ConeCapturedType -> {
renderAnnotationList(annotations)
append(type.render())
renderNullability(type.type)
}
else -> appendError("Unexpected cone type ${type::class.qualifiedName}")
}
}
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.analysis.api.fir.components
import org.jetbrains.kotlin.analysis.api.analyse
import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions
import org.jetbrains.kotlin.analysis.api.fir.executeOnPooledThreadInReadAction
import org.jetbrains.kotlin.analysis.api.fir.test.framework.AbstractHLApiSingleFileTest
import org.jetbrains.kotlin.analysis.api.types.KtType
@@ -31,7 +32,7 @@ abstract class AbstractGetSuperTypesTest : AbstractHLApiSingleFileTest() {
fun List<KtType>.print(name: String) {
appendLine(name)
for (type in this) {
appendLine(type.render())
appendLine(type.render(KtTypeRendererOptions.DEFAULT))
}
appendLine()
}