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

Fix superType resolver

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-03-20 22:38:54 +03:00
committed by Denis Zharkov
parent 49a0b29129
commit a23e4bfdf1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypeResolverTransformer.kt
+5 -5
View File
@@ -27,9 +27,11 @@ class FirSupertypeResolverTransformer : FirAbstractTreeTransformer() {
private lateinit var firSession: FirSession private lateinit var firSession: FirSession
private val currentlyComputing: MutableSet<ClassId> = mutableSetOf() private val currentlyComputing: MutableSet<ClassId> = mutableSetOf()
private val fullyComputed: MutableSet<ClassId> = mutableSetOf() private val fullyComputed: MutableSet<ClassId> = mutableSetOf()
private lateinit var file: FirFile
override fun transformFile(file: FirFile, data: Nothing?): CompositeTransformResult<FirFile> { override fun transformFile(file: FirFile, data: Nothing?): CompositeTransformResult<FirFile> {
firSession = file.fileSession firSession = file.session
this.file = file
return super.transformFile(file, data) return super.transformFile(file, data)
} }
@@ -62,10 +64,8 @@ class FirSupertypeResolverTransformer : FirAbstractTreeTransformer() {
if (classId in fullyComputed) return classLikeDeclaration if (classId in fullyComputed) return classLikeDeclaration
val firFile = firSession.getService(FirProvider::class).getFirClassifierContainerFile(classId) val visitor = ResolveSuperTypesTask(firSession, classId, file, currentlyComputing, fullyComputed)
file.accept(visitor, null).single
val visitor = ResolveSuperTypesTask(firSession, classId, firFile, currentlyComputing, fullyComputed)
firFile.accept(visitor, null).single
return visitor.resultingClass return visitor.resultingClass
} }