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

FIR IDE: fix memory leak in scope provider

Browse Source
This commit is contained in:
Ilya Kirillov
2020-10-27 17:58:53 +03:00
parent 64895fe7da
commit 559b07d78a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirScopeProvider.kt
+6 -5
View File
@@ -40,12 +40,13 @@ import java.util.*
internal class KtFirScopeProvider( internal class KtFirScopeProvider(
analysisSession: KtAnalysisSession, analysisSession: KtAnalysisSession,
private val builder: KtSymbolByFirBuilder, builder: KtSymbolByFirBuilder,
private val project: Project, private val project: Project,
firResolveState: FirModuleResolveState, firResolveState: FirModuleResolveState,
override val token: ValidityToken, override val token: ValidityToken,
) : KtScopeProvider(), ValidityTokenOwner { ) : KtScopeProvider(), ValidityTokenOwner {
override val analysisSession: KtAnalysisSession by weakRef(analysisSession) override val analysisSession: KtAnalysisSession by weakRef(analysisSession)
private val builder by weakRef(builder)
private val firResolveState by weakRef(firResolveState) private val firResolveState by weakRef(firResolveState)
private val firScopeStorage = FirScopeRegistry() private val firScopeStorage = FirScopeRegistry()
@@ -133,13 +134,13 @@ internal class KtFirScopeProvider(
} }
private fun buildCompletionContextForEnclosingDeclaration( private fun buildCompletionContextForEnclosingDeclaration(
originalFile: KtFile, ktFile: KtFile,
positionInFakeFile: KtElement positionInFakeFile: KtElement
): LowLevelFirApiFacadeForCompletion.FirCompletionContext { ): LowLevelFirApiFacadeForCompletion.FirCompletionContext {
val originalFirFile = LowLevelFirApiFacade.getFirFile(originalFile, firResolveState) val firFile = LowLevelFirApiFacade.getFirFile(ktFile, firResolveState)
val declarationContext = EnclosingDeclarationContext.detect(originalFile, positionInFakeFile) val declarationContext = EnclosingDeclarationContext.detect(positionInFakeFile)
return declarationContext.buildCompletionContext(originalFirFile, firResolveState) return declarationContext.buildCompletionContext(firFile, firResolveState)
} }
private fun convertToKtScope(firScope: FirScope): KtScope { private fun convertToKtScope(firScope: FirScope): KtScope {