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

New J2K: Resolve symbols properly

Browse Source
This commit is contained in:
Dimach
2018-05-23 20:03:29 +03:00
committed by Ilya Kirillov
parent f912639999
commit aea0511486
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/NewJavaToKotlinConverter.kt
+1 -1
View File
@@ -45,7 +45,7 @@ class NewJavaToKotlinConverter(
println(fileTrees.prettyPrintTrees()) println(fileTrees.prettyPrintTrees())
val context = ConversionContext( val context = ConversionContext(
JKSymbolProvider(), symbolProvider,
project project
) { treeBuilder.backAnnotation[it] } ) { treeBuilder.backAnnotation[it] }
j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt
+1 -3
View File
@@ -14,7 +14,6 @@ import org.jetbrains.kotlin.j2k.tree.JKTreeElement
import org.jetbrains.kotlin.j2k.tree.JKType import org.jetbrains.kotlin.j2k.tree.JKType
import org.jetbrains.kotlin.j2k.tree.impl.JKClassSymbol import org.jetbrains.kotlin.j2k.tree.impl.JKClassSymbol
import org.jetbrains.kotlin.j2k.tree.impl.JKClassTypeImpl import org.jetbrains.kotlin.j2k.tree.impl.JKClassTypeImpl
import org.jetbrains.kotlin.j2k.tree.impl.JKMultiverseKtClassSymbol
import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.platform.JavaToKotlinClassMap import org.jetbrains.kotlin.platform.JavaToKotlinClassMap
@@ -67,9 +66,8 @@ class TypeMappingConversion(val context: ConversionContext) : MatchBasedConversi
contextElement ?: return null contextElement ?: return null
val newTarget = resolveFqName(fqName, contextElement) as? KtClassOrObject ?: return null val newTarget = resolveFqName(fqName, contextElement) as? KtClassOrObject ?: return null
val newSymbol = JKMultiverseKtClassSymbol(newTarget)
return JKClassTypeImpl(newSymbol, parameters, nullability) return JKClassTypeImpl(context.symbolProvider.provideSymbol(newTarget) as JKClassSymbol, parameters, nullability)
} }
fun mapClassType(type: JKClassType): JKType { fun mapClassType(type: JKClassType): JKType {