From 3275e5229076d336b40d4988315111b962f44f31 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Tue, 22 Apr 2014 20:19:14 +0400
Subject: [PATCH] Got rid of unneeded caching in KotlinCacheService

---
 .../caches/resolve/KotlinResolveCache.kt      | 29 +++++++------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt b/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt
index e47d7c0d501..fd2f8e1784d 100644
--- a/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt
+++ b/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt
@@ -123,25 +123,16 @@ class KotlinCacheService(val project: Project) {
             JS to KotlinResolveCache(project, globalResolveSessionProvider(JS))
     )
 
-    private val syntheticFileCaches = object : SLRUCache<JetFile, SynchronizedCachedValue<KotlinResolveCache>>(2, 3) {
-        override fun createValue(file: JetFile?): SynchronizedCachedValue<KotlinResolveCache> {
-            return SynchronizedCachedValue<KotlinResolveCache>(
+    private val syntheticFileCaches = object : SLRUCache<JetFile, KotlinResolveCache>(2, 3) {
+        override fun createValue(file: JetFile?): KotlinResolveCache {
+            return KotlinResolveCache(
                     project,
-                    {
-                        CachedValueProvider.Result(
-                            KotlinResolveCache(
-                                    project,
-                                    globalResolveSessionProvider(
-                                            TargetPlatformDetector.getPlatform(file!!),
-                                            file
-                                    )
-                            ),
-                            PsiModificationTracker.MODIFICATION_COUNT
-                        )
-                    },
-                    false)
+                    globalResolveSessionProvider(
+                            TargetPlatformDetector.getPlatform(file!!),
+                            file
+                    )
+            )
         }
-
     }
 
     public fun getGlobalLazyResolveSession(platform: TargetPlatform): ResolveSessionForBodies {
@@ -152,7 +143,7 @@ class KotlinCacheService(val project: Project) {
         val file = element.getContainingJetFile()
         if (!isFileInScope(file)) {
             return synchronized(syntheticFileCaches) {
-                syntheticFileCaches[file].getValue().getLazyResolveSession()
+                syntheticFileCaches[file].getLazyResolveSession()
             }
         }
 
@@ -165,7 +156,7 @@ class KotlinCacheService(val project: Project) {
         val firstFile = elements.first().getContainingJetFile()
         if (elements.size == 1 && !isFileInScope(firstFile)) {
             return synchronized(syntheticFileCaches) {
-                syntheticFileCaches[firstFile].getValue().getAnalysisResultsForElements(elements)
+                syntheticFileCaches[firstFile].getAnalysisResultsForElements(elements)
             }
         }