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

New J2K: Fix symbol's fqName

Browse Source
This commit is contained in:
Ilya Kirillov
2018-12-19 16:02:39 +03:00
committed by Ilya Kirillov
parent 7c04590d82
commit 1c4e811717
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/symbols.kt
+6 -8
View File
@@ -8,14 +8,13 @@ package org.jetbrains.kotlin.j2k.tree.impl
import com.intellij.psi.* import com.intellij.psi.*
import com.intellij.psi.impl.source.tree.java.PsiReferenceExpressionImpl import com.intellij.psi.impl.source.tree.java.PsiReferenceExpressionImpl
import com.intellij.util.reverse import com.intellij.util.reverse
import org.jetbrains.kotlin.idea.refactoring.fqName.getKotlinFqName
import org.jetbrains.kotlin.j2k.JKSymbolProvider import org.jetbrains.kotlin.j2k.JKSymbolProvider
import org.jetbrains.kotlin.j2k.conversions.parentOfType import org.jetbrains.kotlin.j2k.conversions.parentOfType
import org.jetbrains.kotlin.j2k.conversions.resolveFqName import org.jetbrains.kotlin.j2k.conversions.resolveFqName
import org.jetbrains.kotlin.j2k.tree.* import org.jetbrains.kotlin.j2k.tree.*
import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.KtNamedFunction
import org.jetbrains.kotlin.psi.KtProperty
import org.jetbrains.kotlin.psi.psiUtil.getValueParameterList import org.jetbrains.kotlin.psi.psiUtil.getValueParameterList
import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.KotlinType
@@ -142,7 +141,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.name!! // TODO("Fix this") get() = target.fqName!!.asString()
} }
class JKUniverseFieldSymbol : JKFieldSymbol, JKUniverseSymbol<JKVariable> { class JKUniverseFieldSymbol : JKFieldSymbol, JKUniverseSymbol<JKVariable> {
@@ -165,10 +164,10 @@ class JKMultiverseFieldSymbol(override val target: PsiVariable, private val symb
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.name!! // TODO("Fix this") get() = target.getKotlinFqName()?.asString() ?: target.name!!
} }
class JKMultiversePropertySymbol(override val target: KtProperty, private val symbolProvider: JKSymbolProvider) : JKFieldSymbol { class JKMultiversePropertySymbol(override val target: KtCallableDeclaration, private val symbolProvider: JKSymbolProvider) : JKFieldSymbol {
override val fieldType: JKType override val fieldType: JKType
get() = target.typeReference!!.typeElement!!.toJK(symbolProvider) get() = target.typeReference!!.typeElement!!.toJK(symbolProvider)
override val name: String override val name: String
@@ -176,7 +175,7 @@ class JKMultiversePropertySymbol(override val target: KtProperty, private val sy
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.name!! // TODO("Fix this") get() = target.fqName!!.asString()
} }
class JKUnresolvedField(override val target: PsiReference, private val symbolProvider: JKSymbolProvider) : JKFieldSymbol { class JKUnresolvedField(override val target: PsiReference, private val symbolProvider: JKSymbolProvider) : JKFieldSymbol {
@@ -214,7 +213,6 @@ class JKUnresolvedMethod(
} }
class JKUnresolvedClassSymbol(override val target: String) : JKClassSymbol { class JKUnresolvedClassSymbol(override val target: String) : JKClassSymbol {
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?