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

[FIR] Fix usage of typeParameterStack from parent class in java loading

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-02-10 10:32:19 +03:00
parent dd67568cf6
commit c79fd61dba
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt
+7 -3
View File
@@ -49,6 +49,7 @@ class JavaSymbolProvider(
private val scopeProvider = JavaScopeProvider(::wrapScopeWithJvmMapped, this) private val scopeProvider = JavaScopeProvider(::wrapScopeWithJvmMapped, this)
private val facade: KotlinJavaPsiFacade get() = KotlinJavaPsiFacade.getInstance(project) private val facade: KotlinJavaPsiFacade get() = KotlinJavaPsiFacade.getInstance(project)
private val parentClassTypeParameterStackCache: MutableMap<FirRegularClassSymbol, JavaTypeParameterStack> = mutableMapOf()
private fun findClass( private fun findClass(
classId: ClassId, classId: ClassId,
@@ -135,9 +136,10 @@ class JavaSymbolProvider(
if (!isTopLevel) { if (!isTopLevel) {
val parentId = ClassId(classId.packageFqName, parentFqName, false) val parentId = ClassId(classId.packageFqName, parentFqName, false)
val parentClassSymbol = getClassLikeSymbolByFqName(parentId) val parentClassSymbol = getClassLikeSymbolByFqName(parentId)
val parentClass = parentClassSymbol?.fir val parentStack = parentClassTypeParameterStackCache[parentClassSymbol] ?:
if (parentClass is FirJavaClass) { (parentClassSymbol?.fir as? FirJavaClass)?.javaTypeParameterStack
javaTypeParameterStack.addStack(parentClass.javaTypeParameterStack) if (parentStack != null) {
javaTypeParameterStack.addStack(parentStack)
} }
} }
buildJavaClass { buildJavaClass {
@@ -151,6 +153,7 @@ class JavaSymbolProvider(
this.isTopLevel = isTopLevel this.isTopLevel = isTopLevel
isStatic = javaClass.isStatic isStatic = javaClass.isStatic
this.javaTypeParameterStack = javaTypeParameterStack this.javaTypeParameterStack = javaTypeParameterStack
parentClassTypeParameterStackCache[firSymbol] = javaTypeParameterStack
existingNestedClassifierNames += javaClass.innerClassNames existingNestedClassifierNames += javaClass.innerClassNames
scopeProvider = this@JavaSymbolProvider.scopeProvider scopeProvider = this@JavaSymbolProvider.scopeProvider
typeParameters += foundClass.typeParameters.convertTypeParameters(javaTypeParameterStack) typeParameters += foundClass.typeParameters.convertTypeParameters(javaTypeParameterStack)
@@ -255,6 +258,7 @@ class JavaSymbolProvider(
generateValueOfFunction(session, classId.packageFqName, classId.relativeClassName) generateValueOfFunction(session, classId.packageFqName, classId.relativeClassName)
} }
isNotSam = isNotSam() isNotSam = isNotSam()
parentClassTypeParameterStackCache.remove(firSymbol)
} }
} }
} }