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

Refactoring: remove unused variable, invert if (move common case to general return, remove boolean invert operator)

Browse Source
This commit is contained in:
Nikolay Krasko
2013-12-30 20:20:34 +04:00
parent ff747c0e34
commit 6e25582019
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinLightClassContextCache.kt
+4 -6
View File
@@ -45,8 +45,6 @@ import org.jetbrains.jet.di.InjectorForJavaDescriptorResolverUtil
class KotlinLightClassContextCache(val project: Project) {
private val cacheKey = Key.create<CachedValue<ResolveElementCache>>("KOTLIN_LIGHT_CLASS_CONTEXT_CACHE")
private val lock = Any()
private val provider = object: CachedValueProvider<ResolveElementCache> {
override fun compute(): CachedValueProvider.Result<ResolveElementCache> {
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()
}
}