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

New J2K: Assume KtConstructor as function for symbol provider

Browse Source
This commit is contained in:
Ilya Kirillov
2019-04-02 07:55:01 +03:00
committed by Ilya Kirillov
parent 6d621a86d2
commit 8cec43fda3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nj2k/src/org/jetbrains/kotlin/nj2k/JKSymbolProvider.kt
+1 -1
View File
@@ -36,7 +36,7 @@ class JKSymbolProvider {
is KtClassOrObject -> JKMultiverseKtClassSymbol(psi, this) is KtClassOrObject -> JKMultiverseKtClassSymbol(psi, this)
is PsiMethod -> JKMultiverseMethodSymbol(psi, this) is PsiMethod -> JKMultiverseMethodSymbol(psi, this)
is PsiField -> JKMultiverseFieldSymbol(psi, this) is PsiField -> JKMultiverseFieldSymbol(psi, this)
is KtNamedFunction -> JKMultiverseFunctionSymbol(psi, this) is KtFunction -> JKMultiverseFunctionSymbol(psi, this)
is KtProperty -> JKMultiversePropertySymbol(psi, this) is KtProperty -> JKMultiversePropertySymbol(psi, this)
is KtParameter -> JKMultiversePropertySymbol(psi, this) is KtParameter -> JKMultiversePropertySymbol(psi, this)
is PsiParameter -> JKMultiverseFieldSymbol(psi, this) is PsiParameter -> JKMultiverseFieldSymbol(psi, this)
nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/symbols.kt
+2 -2
View File
@@ -163,7 +163,7 @@ class JKMultiverseMethodSymbol(override val target: PsiMethod, private val symbo
get() = target.getKotlinFqName()?.asString() ?: target.name 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? override val receiverType: JKType?
get() = target.receiverTypeReference?.toJK(symbolProvider) get() = target.receiverTypeReference?.toJK(symbolProvider)
override val parameterTypes: List<JKType>? override val parameterTypes: List<JKType>?
@@ -186,7 +186,7 @@ class JKMultiverseFunctionSymbol(override val target: KtNamedFunction, private v
override val declaredIn: JKSymbol override val declaredIn: JKSymbol
get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
override val fqName: String override val fqName: String
get() = target.fqName!!.asString() get() = target.fqName?.asString() ?: target.name!!
} }
class JKUniverseFieldSymbol(override val symbolProvider: JKSymbolProvider) : JKFieldSymbol, JKUniverseSymbol<JKVariable>() { class JKUniverseFieldSymbol(override val symbolProvider: JKSymbolProvider) : JKFieldSymbol, JKUniverseSymbol<JKVariable>() {