From 410000f94c9cc77a8739a8d42c3946475c1eccc5 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Wed, 19 Dec 2018 15:47:27 +0300 Subject: [PATCH] New J2K: Fix types for kotlin properties --- j2k/newSrc/org/jetbrains/kotlin/j2k/JKSymbolProvider.kt | 7 +++++++ .../kotlin/j2k/conversions/TypeMappingConversion.kt | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/JKSymbolProvider.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/JKSymbolProvider.kt index 8d5cb302d34..86fffea1286 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/JKSymbolProvider.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/JKSymbolProvider.kt @@ -10,8 +10,10 @@ import org.jetbrains.kotlin.j2k.conversions.resolveFqName import org.jetbrains.kotlin.j2k.tree.* import org.jetbrains.kotlin.j2k.tree.impl.* import org.jetbrains.kotlin.name.ClassId +import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtNamedFunction +import org.jetbrains.kotlin.psi.KtParameter import org.jetbrains.kotlin.utils.addToStdlib.safeAs import org.jetbrains.kotlin.psi.KtProperty @@ -35,6 +37,7 @@ class JKSymbolProvider { is PsiField -> JKMultiverseFieldSymbol(psi, this) is KtNamedFunction -> JKMultiverseFunctionSymbol(psi, this) is KtProperty -> JKMultiversePropertySymbol(psi, this) + is KtParameter -> JKMultiversePropertySymbol(psi, this) is PsiLocalVariable -> JKMultiverseFieldSymbol(psi, this) else -> TODO(psi::class.toString()) } @@ -94,6 +97,10 @@ class JKSymbolProvider { internal inline fun provideByFqName(fqName: String, context: PsiElement = symbolsByPsi.keys.first()): T = provideByFqName(ClassId.fromString(fqName), context) + internal inline fun provideByFqName(fqName: FqName, context: PsiElement = symbolsByPsi.keys.first()): T = + provideByFqName(fqName.asString(), context) + + private inner class ElementVisitor : JavaElementVisitor() { override fun visitClass(aClass: PsiClass) { provideUniverseSymbol(aClass) diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt index 57e722dc44e..298e7ce0e73 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt @@ -93,7 +93,7 @@ class TypeMappingConversion(val context: ConversionContext) : RecursiveApplicabl return when (parent) { is JKJavaMethod -> typeFlavorCalculator.methodNullability(parent.psi as PsiMethod) is JKJavaField -> typeFlavorCalculator.variableNullability(parent.psi as PsiVariable) - is JKLocalVariable -> typeFlavorCalculator.variableNullability(parent.psi as PsiVariable) + is JKVariable -> typeFlavorCalculator.variableNullability(parent.psi as PsiVariable) else -> Nullability.Default } }