From 98f2604df0a05ad560e5b409a095abe91a64f520 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 30 Mar 2020 14:41:35 +0300 Subject: [PATCH] New J2K: introduce type alias symbol --- nj2k/src/org/jetbrains/kotlin/nj2k/JKSymbolProvider.kt | 1 + nj2k/src/org/jetbrains/kotlin/nj2k/symbols/JKClassSymbol.kt | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/JKSymbolProvider.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/JKSymbolProvider.kt index c58337bf621..73391d793c5 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/JKSymbolProvider.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/JKSymbolProvider.kt @@ -45,6 +45,7 @@ class JKSymbolProvider(private val resolver: JKResolver) { is PsiParameter -> JKMultiverseFieldSymbol(psi, typeFactory) is PsiLocalVariable -> JKMultiverseFieldSymbol(psi, typeFactory) is PsiPackage -> JKMultiversePackageSymbol(psi, typeFactory) + is KtTypeAlias -> JKTypeAliasKtClassSymbol(psi, typeFactory) else -> TODO(psi::class.toString()) } diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/symbols/JKClassSymbol.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/symbols/JKClassSymbol.kt index 09cb3220bf4..c0f93fbdd64 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/symbols/JKClassSymbol.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/symbols/JKClassSymbol.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.nj2k.JKSymbolProvider import org.jetbrains.kotlin.nj2k.tree.JKClass import org.jetbrains.kotlin.nj2k.types.JKTypeFactory import org.jetbrains.kotlin.psi.KtClassOrObject +import org.jetbrains.kotlin.psi.KtTypeAlias sealed class JKClassSymbol : JKSymbol @@ -33,6 +34,11 @@ class JKMultiverseKtClassSymbol( override val typeFactory: JKTypeFactory ) : JKClassSymbol(), JKMultiverseKtSymbol +class JKTypeAliasKtClassSymbol( + override val target: KtTypeAlias, + override val typeFactory: JKTypeFactory +) : JKClassSymbol(), JKMultiverseKtSymbol + class JKUnresolvedClassSymbol( override val target: String, override val typeFactory: JKTypeFactory