LTDA: Fix REPL and make it work with lazy resolve

compiler/frontend/src/org/jetbrains/jet/lang/resolve/LazyTopDownAnalyzer.java

@@ -388,6 +388,11 @@ public class LazyTopDownAnalyzer {
             }
         }
     }
+
+    @NotNull
+    public KotlinCodeAnalyzer getCodeAnalyzer() {
+        return resolveSession;
+    }
 }
 
 

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java

@@ -30,9 +30,11 @@ import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyClassDescriptor;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.scopes.ChainedScope;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
+import org.jetbrains.jet.storage.LockBasedStorageManager;
 import org.jetbrains.jet.storage.MemoizedFunctionToNotNull;
 import org.jetbrains.jet.storage.NotNullLazyValue;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
@@ -42,6 +44,7 @@ public class ScopeProvider {
     private final MemoizedFunctionToNotNull<JetFile, LazyImportScope> explicitImportScopes;
 
     private final NotNullLazyValue<JetScope> defaultImportsScope;
+    private Function1<JetFile, JetScope> additionalScopesProvider;
 
     public ScopeProvider(@NotNull ResolveSession resolveSession) {
         this.resolveSession = resolveSession;
@@ -74,10 +77,29 @@ public class ScopeProvider {
     public JetScope getFileScope(@NotNull JetFile file) {
         return new ChainedScope(resolveSession.getPackageFragment(file.getPackageFqName()),
                                 "File scope: " + file.getName(),
-                                getFilePackageDescriptor(file).getMemberScope(),
-                                JetModuleUtil.getSubpackagesOfRootScope(resolveSession.getModuleDescriptor()),
-                                explicitImportScopes.invoke(file),
-                                defaultImportsScope.invoke());
+                                collectFileScopes(file));
+    }
+
+    public JetScope[] collectFileScopes(@NotNull JetFile file) {
+        List<JetScope> list = new ArrayList<JetScope>();
+        list.add(getFilePackageDescriptor(file).getMemberScope());
+        list.add(JetModuleUtil.getSubpackagesOfRootScope(resolveSession.getModuleDescriptor()));
+        list.add(explicitImportScopes.invoke(file));
+
+        if (additionalScopesProvider != null) {
+            JetScope additionalScope = additionalScopesProvider.invoke(file);
+            if (additionalScope != null) {
+                list.add(additionalScope);
+            }
+        }
+
+        list.add(defaultImportsScope.invoke());
+
+        return list.toArray(new JetScope[list.size()]);
+    }
+
+    public void setAdditionalFileScopesProvider(@NotNull Function1<JetFile, JetScope> scopeProvider) {
+        this.additionalScopesProvider = scopeProvider;
     }
 
     @NotNull

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/CombinedPackageMemberDeclarationProvider.kt

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2010-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.lang.resolve.lazy.declarations
+
+import org.jetbrains.jet.lang.resolve.name.Name
+import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter
+
+public class CombinedPackageMemberDeclarationProvider(val providers: Collection<PackageMemberDeclarationProvider>) : PackageMemberDeclarationProvider {
+    override fun getAllDeclaredSubPackages() = providers.flatMap { it.getAllDeclaredSubPackages() }
+
+    override fun getPackageFiles() = providers.flatMap { it.getPackageFiles() }
+
+    override fun getDeclarations(kindFilter: DescriptorKindFilter, nameFilter: (Name) -> Boolean)
+            = providers.flatMap { it.getDeclarations(kindFilter, nameFilter) }
+
+    override fun getFunctionDeclarations(name: Name) = providers.flatMap { it.getFunctionDeclarations(name) }
+
+    override fun getPropertyDeclarations(name: Name) = providers.flatMap { it.getPropertyDeclarations(name) }
+
+    override fun getClassOrObjectDeclarations(name: Name) = providers.flatMap { it.getClassOrObjectDeclarations(name) }
+}