From a832c12550f6ed9396db767b67dd17d618f56fae Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Mon, 23 Mar 2020 14:49:47 +0000 Subject: [PATCH] Fetch analysis results if it is available Relates to #KT-37467 and #KT-37515 --- .../caches/resolve/ProjectResolutionFacade.kt | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt index eea55b41ecc..f342e967a2d 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt @@ -137,15 +137,13 @@ internal class ProjectResolutionFacade( } internal fun fetchAnalysisResultsForElement(element: KtElement): AnalysisResult? { - -// val slruCache = synchronized(analysisResults) { -// analysisResults.upToDateOrNull?.get() ?: return null -// } -// val perFileCache = synchronized(slruCache) { -// slruCache[element.containingKtFile] -// } -// return perFileCache.fetchAnalysisResults(element) - return null + val slruCache = synchronized(analysisResults) { + analysisResults.upToDateOrNull?.get() ?: return null + } + val perFileCache = synchronized(slruCache) { + slruCache.getIfCached(element.containingKtFile) + } + return perFileCache?.fetchAnalysisResults(element) } override fun toString(): String {