From 06b96c2b12325ebbeb44410c7a0bb728d02a8223 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 5 Aug 2015 12:47:14 +0300 Subject: [PATCH] Drop CacheExtension --- .../kotlin/idea/caches/resolve/KotlinResolveCache.kt | 10 ---------- .../kotlin/idea/caches/resolve/ResolutionFacade.kt | 3 --- .../kotlin/idea/caches/resolve/ResolutionFacadeImpl.kt | 2 -- 3 files changed, 15 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt index 9f6af39752f..a6325e56306 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt @@ -21,11 +21,7 @@ import com.intellij.openapi.project.DumbService import com.intellij.openapi.project.IndexNotReadyException import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement -import com.intellij.psi.util.CachedValueProvider -import com.intellij.psi.util.CachedValuesManager -import com.intellij.psi.util.PsiModificationTracker import com.intellij.psi.util.PsiTreeUtil -import com.intellij.util.containers.SLRUCache import org.jetbrains.kotlin.analyzer.AnalysisResult import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.kotlin.container.ComponentProvider @@ -44,12 +40,6 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.lazy.ResolveSession import java.util.HashMap -public interface CacheExtension { - public val platform: TargetPlatform - public fun getData(resolverProvider: ModuleResolverProvider): T -} - - private class PerFileAnalysisCache(val file: JetFile, val componentProvider: ComponentProvider) { private val cache = HashMap() diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ResolutionFacade.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ResolutionFacade.kt index e3f67cfb346..b2d2fe6c3bd 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ResolutionFacade.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ResolutionFacade.kt @@ -29,7 +29,6 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.scopes.JetScope public interface ResolutionFacade { - public fun analyze(element: JetElement, bodyResolveMode: BodyResolveMode = BodyResolveMode.FULL): BindingContext public fun analyzeFullyAndGetResult(elements: Collection): AnalysisResult @@ -42,8 +41,6 @@ public interface ResolutionFacade { public fun findModuleDescriptor(element: JetElement): ModuleDescriptor - public fun get(extension: CacheExtension): T - public fun getFrontendService(element: PsiElement, serviceClass: Class): T public fun getFrontendService(moduleDescriptor: ModuleDescriptor, serviceClass: Class): T diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ResolutionFacadeImpl.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ResolutionFacadeImpl.kt index 23b293d6663..2ef77066954 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ResolutionFacadeImpl.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ResolutionFacadeImpl.kt @@ -42,8 +42,6 @@ private class ResolutionFacadeImpl( private val project: Project, computeModuleResolverProvider: () -> CachedValueProvider.Result ) : ResolutionFacade { - override fun get(extension: CacheExtension): T = error("TODO: support") - private val resolverCache = SynchronizedCachedValue(project, computeModuleResolverProvider, trackValue = false) val moduleResolverProvider: ModuleResolverProvider