From c04ce4401f08437d06c80e4c718ba5b4553ae1ff Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Thu, 27 Feb 2014 13:49:17 +0400
Subject: [PATCH] getDeclaredCallableMembers() fixed for lazy classes

Otherwise synthesized members were not included
---
 .../lazy/descriptors/AbstractLazyMemberScope.java        | 9 ++-------
 .../resolve/lazy/descriptors/LazyClassDescriptor.java    | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java
index 8d70cd1725f..ff40fc6fab1 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java
@@ -206,16 +206,11 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
     @NotNull
     @Override
     public Collection<DeclarationDescriptor> getAllDescriptors() {
-        Collection<DeclarationDescriptor> result = new LinkedHashSet<DeclarationDescriptor>(getDescriptorsFromDeclaredElements());
+        Collection<DeclarationDescriptor> result = new LinkedHashSet<DeclarationDescriptor>(descriptorsFromDeclaredElements.invoke());
         result.addAll(extraDescriptors.invoke());
         return result;
     }
 
-    @NotNull
-    /*package*/ Collection<DeclarationDescriptor> getDescriptorsFromDeclaredElements() {
-        return descriptorsFromDeclaredElements.invoke();
-    }
-
     @NotNull
     private Collection<DeclarationDescriptor> computeDescriptorsFromDeclaredElements() {
         List<JetDeclaration> declarations = declarationProvider.getAllDeclarations();
@@ -287,4 +282,4 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
         p.popIndent();
         p.println("}");
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java
index b0de922a2b7..a792f154fc0 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java
@@ -225,7 +225,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements LazyEnti
     public Collection<CallableMemberDescriptor> getDeclaredCallableMembers() {
         //noinspection unchecked
         return (Collection) KotlinPackage.filter(
-                unsubstitutedMemberScope.getDescriptorsFromDeclaredElements(),
+                unsubstitutedMemberScope.getAllDescriptors(),
                 new Function1<DeclarationDescriptor, Boolean>() {
                     @Override
                     public Boolean invoke(DeclarationDescriptor descriptor) {