LTDA: Injector with lazy TDA for JVM target

- REPL is broken
 - Tests for Kotlin - Java - Kotlin hierarchy may fail
This commit is contained in:
Nikolay Krasko
2014-09-19 13:24:15 +04:00
parent b57e5fa971
commit 23c6498e1e
13 changed files with 140 additions and 165 deletions
@@ -20,10 +20,7 @@ import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.ReadOnly;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
import org.jetbrains.jet.lang.descriptors.ScriptDescriptor;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.BindingContextUtils;
@@ -137,4 +134,10 @@ public class ResolveSessionForBodies implements KotlinCodeAnalyzer {
public ExceptionTracker getExceptionTracker() {
return resolveSession.getExceptionTracker();
}
@NotNull
@Override
public PackageFragmentProvider getPackageFragmentProvider() {
return resolveSession.getPackageFragmentProvider();
}
}
@@ -95,6 +95,8 @@ public class BuiltInsReferenceResolver extends AbstractProjectComponent {
@Override
public void run() {
GlobalContextImpl globalContext = ContextPackage.GlobalContext();
// TODO built-ins and lazy resolve
TopDownAnalysisParameters topDownAnalysisParameters = TopDownAnalysisParameters.create(
globalContext.getStorageManager(),
globalContext.getExceptionTracker(),