From 6e255820195207a45873d8171ab2960eaf602400 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 30 Dec 2013 20:20:34 +0400 Subject: [PATCH] Refactoring: remove unused variable, invert if (move common case to general return, remove boolean invert operator) --- .../caches/resolve/KotlinLightClassContextCache.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinLightClassContextCache.kt b/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinLightClassContextCache.kt index 74a1d81a78f..b5982bd4943 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinLightClassContextCache.kt +++ b/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinLightClassContextCache.kt @@ -45,8 +45,6 @@ import org.jetbrains.jet.di.InjectorForJavaDescriptorResolverUtil class KotlinLightClassContextCache(val project: Project) { private val cacheKey = Key.create>("KOTLIN_LIGHT_CLASS_CONTEXT_CACHE") - private val lock = Any() - private val provider = object: CachedValueProvider { override fun compute(): CachedValueProvider.Result { val trace = DelegatingBindingTrace( @@ -69,12 +67,12 @@ class KotlinLightClassContextCache(val project: Project) { } public fun getLightClassContext(classOrObject: JetClassOrObject): BindingContext { - if (!JetPsiUtil.isLocal(classOrObject)) { - return KotlinCacheManager.getInstance(project).getPossiblyIncompleteDeclarationsForLightClassGeneration().getBindingContext() + if (JetPsiUtil.isLocal(classOrObject)) { + val resolveElementCache = CachedValuesManager.getManager(project).getCachedValue(project, cacheKey, provider, false) + return resolveElementCache?.resolveToElement(classOrObject) ?: BindingContext.EMPTY } - val resolveElementCache = CachedValuesManager.getManager(project).getCachedValue(project, cacheKey, provider, false) - return resolveElementCache?.resolveToElement(classOrObject) ?: BindingContext.EMPTY + return KotlinCacheManager.getInstance(project).getPossiblyIncompleteDeclarationsForLightClassGeneration().getBindingContext() } }