From 8cec43fda3ba2defac59726b3a3d18f793a474a4 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 2 Apr 2019 07:55:01 +0300 Subject: [PATCH] New J2K: Assume KtConstructor as function for symbol provider --- nj2k/src/org/jetbrains/kotlin/nj2k/JKSymbolProvider.kt | 2 +- nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/symbols.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/JKSymbolProvider.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/JKSymbolProvider.kt index 8ed2ec71693..814c2b711b9 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/JKSymbolProvider.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/JKSymbolProvider.kt @@ -36,7 +36,7 @@ class JKSymbolProvider { is KtClassOrObject -> JKMultiverseKtClassSymbol(psi, this) is PsiMethod -> JKMultiverseMethodSymbol(psi, this) is PsiField -> JKMultiverseFieldSymbol(psi, this) - is KtNamedFunction -> JKMultiverseFunctionSymbol(psi, this) + is KtFunction -> JKMultiverseFunctionSymbol(psi, this) is KtProperty -> JKMultiversePropertySymbol(psi, this) is KtParameter -> JKMultiversePropertySymbol(psi, this) is PsiParameter -> JKMultiverseFieldSymbol(psi, this) diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/symbols.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/symbols.kt index 9e3b97cc3d1..b8e2a5c8310 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/symbols.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/symbols.kt @@ -163,7 +163,7 @@ class JKMultiverseMethodSymbol(override val target: PsiMethod, private val symbo get() = target.getKotlinFqName()?.asString() ?: target.name } -class JKMultiverseFunctionSymbol(override val target: KtNamedFunction, private val symbolProvider: JKSymbolProvider) : JKMethodSymbol { +class JKMultiverseFunctionSymbol(override val target: KtFunction, private val symbolProvider: JKSymbolProvider) : JKMethodSymbol { override val receiverType: JKType? get() = target.receiverTypeReference?.toJK(symbolProvider) override val parameterTypes: List? @@ -186,7 +186,7 @@ class JKMultiverseFunctionSymbol(override val target: KtNamedFunction, private v override val declaredIn: JKSymbol get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. override val fqName: String - get() = target.fqName!!.asString() + get() = target.fqName?.asString() ?: target.name!! } class JKUniverseFieldSymbol(override val symbolProvider: JKSymbolProvider) : JKFieldSymbol, JKUniverseSymbol() {