From c26c8f0a845d277e033846bfbedd7bdd7aa7e435 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Mon, 27 Oct 2014 14:47:31 +0300
Subject: [PATCH] Workaround for compiler's bug

---
 .../lazy/descriptors/AbstractLazyMemberScope.kt    | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.kt
index a41a05e4502..0646d2d603e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.kt
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.kt
@@ -77,9 +77,13 @@ public abstract class AbstractLazyMemberScope<D : DeclarationDescriptor, DP : De
 
     override fun getContainingDeclaration() = thisDescriptor
 
-    override fun getClassifier(name: Name) = classDescriptors(name).firstOrNull()
+    override fun getClassifier(name: Name): ClassDescriptor? {
+        return classDescriptors.invoke(name).firstOrNull()
+    }
 
-    override fun getFunctions(name: Name) = functionDescriptors(name)
+    override fun getFunctions(name: Name): Collection<FunctionDescriptor> {
+        return functionDescriptors.invoke(name)
+    }
 
     private fun doGetFunctions(name: Name): Collection<FunctionDescriptor> {
         val result = Sets.newLinkedHashSet<FunctionDescriptor>()
@@ -106,7 +110,9 @@ public abstract class AbstractLazyMemberScope<D : DeclarationDescriptor, DP : De
 
     protected abstract fun getNonDeclaredFunctions(name: Name, result: MutableSet<FunctionDescriptor>)
 
-    override fun getProperties(name: Name) = propertyDescriptors(name)
+    override fun getProperties(name: Name): Collection<VariableDescriptor> {
+        return propertyDescriptors.invoke(name)
+    }
 
     public fun doGetProperties(name: Name): Collection<VariableDescriptor> {
         val result = Sets.newLinkedHashSet<VariableDescriptor>()
@@ -160,7 +166,7 @@ public abstract class AbstractLazyMemberScope<D : DeclarationDescriptor, DP : De
                 result.addAll(getProperties(declaration.getNameAsSafeName()))
             }
             else if (declaration is JetScript) {
-                result.addAll(classDescriptors(ScriptNameUtil.classNameForScript(declaration).shortName()))
+                result.addAll(classDescriptors.invoke(ScriptNameUtil.classNameForScript(declaration).shortName()))
             }
             else if (declaration is JetTypedef || declaration is JetMultiDeclaration) {
                 // Do nothing for typedefs as they are not supported.