Fixing compilation after merge

2012-07-09 13:09:20 +04:00
parent 79c101ffb1
commit 7f6222cc4e
5 changed files with 32 additions and 44 deletions
@@ -20,12 +20,11 @@ package org.jetbrains.jet.di;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
-import org.jetbrains.jet.lang.resolve.java.CompilerDependencies;
+import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode;
 import org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration;
-import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
 import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices;
 import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
-import org.jetbrains.jet.lang.resolve.java.PsiClassFinderForJvm;
+import org.jetbrains.jet.lang.resolve.java.PsiClassFinderImpl;
 import org.jetbrains.jet.lang.resolve.java.JavaTypeTransformer;
 import org.jetbrains.jet.lang.resolve.java.JavaDescriptorSignatureResolver;
 import org.jetbrains.jet.lang.resolve.NamespaceFactoryImpl;
@@ -38,12 +37,11 @@ public class InjectorForJavaDescriptorResolver {
    private final Project project;
    private final BindingTrace bindingTrace;
    private final ModuleDescriptor moduleDescriptor;
-    private final CompilerDependencies compilerDependencies;
+    private final BuiltinsScopeExtensionMode builtinsScopeExtensionMode;
    private JavaBridgeConfiguration javaBridgeConfiguration;
-    private CompilerSpecialMode compilerSpecialMode;
    private JavaSemanticServices javaSemanticServices;
    private JavaDescriptorResolver javaDescriptorResolver;
-    private PsiClassFinderForJvm psiClassFinderForJvm;
+    private PsiClassFinderImpl psiClassFinder;
    private JavaTypeTransformer javaTypeTransformer;
    private JavaDescriptorSignatureResolver javaDescriptorSignatureResolver;
    private NamespaceFactoryImpl namespaceFactory;
@@ -52,39 +50,37 @@ public class InjectorForJavaDescriptorResolver {
        @NotNull Project project,
        @NotNull BindingTrace bindingTrace,
        @NotNull ModuleDescriptor moduleDescriptor,
-        @NotNull CompilerDependencies compilerDependencies
+        @NotNull BuiltinsScopeExtensionMode builtinsScopeExtensionMode
    ) {
        this.project = project;
        this.bindingTrace = bindingTrace;
        this.moduleDescriptor = moduleDescriptor;
-        this.compilerDependencies = compilerDependencies;
+        this.builtinsScopeExtensionMode = builtinsScopeExtensionMode;
        this.javaBridgeConfiguration = new JavaBridgeConfiguration();
-        this.compilerSpecialMode = compilerDependencies.getCompilerSpecialMode();
        this.javaSemanticServices = new JavaSemanticServices();
        this.javaDescriptorResolver = new JavaDescriptorResolver();
-        this.psiClassFinderForJvm = new PsiClassFinderForJvm();
+        this.psiClassFinder = new PsiClassFinderImpl();
        this.javaTypeTransformer = new JavaTypeTransformer();
        this.javaDescriptorSignatureResolver = new JavaDescriptorSignatureResolver();
        this.namespaceFactory = new NamespaceFactoryImpl();

+        javaBridgeConfiguration.setBuiltinsScopeExtensionMode(builtinsScopeExtensionMode);
        javaBridgeConfiguration.setJavaSemanticServices(javaSemanticServices);
-        javaBridgeConfiguration.setMode(compilerSpecialMode);
        javaBridgeConfiguration.setProject(project);

        this.javaSemanticServices.setDescriptorResolver(javaDescriptorResolver);
-        this.javaSemanticServices.setPsiClassFinder(psiClassFinderForJvm);
+        this.javaSemanticServices.setPsiClassFinder(psiClassFinder);
        this.javaSemanticServices.setTrace(bindingTrace);
        this.javaSemanticServices.setTypeTransformer(javaTypeTransformer);

        this.javaDescriptorResolver.setJavaDescriptorSignatureResolver(javaDescriptorSignatureResolver);
        this.javaDescriptorResolver.setNamespaceFactory(namespaceFactory);
        this.javaDescriptorResolver.setProject(project);
-        this.javaDescriptorResolver.setPsiClassFinder(psiClassFinderForJvm);
+        this.javaDescriptorResolver.setPsiClassFinder(psiClassFinder);
        this.javaDescriptorResolver.setSemanticServices(javaSemanticServices);
        this.javaDescriptorResolver.setTrace(bindingTrace);

-        this.psiClassFinderForJvm.setCompilerDependencies(compilerDependencies);
-        this.psiClassFinderForJvm.setProject(project);
+        this.psiClassFinder.setProject(project);

        javaTypeTransformer.setJavaSemanticServices(javaSemanticServices);
        javaTypeTransformer.setResolver(javaDescriptorResolver);
@@ -98,7 +94,7 @@ public class InjectorForJavaDescriptorResolver {

        javaBridgeConfiguration.init();

-        psiClassFinderForJvm.initialize();
+        psiClassFinder.initialize();

    }

@@ -126,8 +122,8 @@ public class InjectorForJavaDescriptorResolver {
        return this.javaDescriptorResolver;
    }

-    public PsiClassFinderForJvm getPsiClassFinderForJvm() {
-        return this.psiClassFinderForJvm;
+    public PsiClassFinderImpl getPsiClassFinder() {
+        return this.psiClassFinder;
    }

 }
@@ -28,8 +28,6 @@ import com.intellij.openapi.project.Project;
 import org.jetbrains.jet.lang.resolve.java.JavaTypeTransformer;
 import org.jetbrains.jet.lang.resolve.java.JavaDescriptorSignatureResolver;
 import org.jetbrains.jet.lang.resolve.NamespaceFactoryImpl;
-import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode;
-import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;

@@ -28,6 +28,7 @@ import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
 import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode;
+import org.jetbrains.jet.lang.ModuleConfiguration;
 import org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration;
 import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
 import org.jetbrains.jet.lang.resolve.java.PsiClassFinderImpl;
@@ -49,16 +50,11 @@ import org.jetbrains.jet.lang.resolve.ScriptBodyResolver;
 import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices;
 import org.jetbrains.jet.lang.resolve.java.JavaTypeTransformer;
 import org.jetbrains.jet.lang.resolve.java.JavaDescriptorSignatureResolver;
-import com.intellij.openapi.project.Project;
-import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters;
-import org.jetbrains.jet.lang.resolve.BindingTrace;
-import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
-import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode;
 import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;

 /* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
-public class InjectorForTopDownAnalyzerForJvm {
+public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnalyzer {

    private TopDownAnalyzer topDownAnalyzer;
    private TopDownAnalysisContext topDownAnalysisContext;
@@ -71,7 +67,7 @@ public class InjectorForTopDownAnalyzerForJvm {
    private final BindingTrace bindingTrace;
    private final ModuleDescriptor moduleDescriptor;
    private final BuiltinsScopeExtensionMode builtinsScopeExtensionMode;
-    private JavaBridgeConfiguration javaBridgeConfiguration;
+    private JavaBridgeConfiguration moduleConfiguration;
    private JavaDescriptorResolver javaDescriptorResolver;
    private PsiClassFinderImpl psiClassFinder;
    private NamespaceFactoryImpl namespaceFactory;
@@ -111,7 +107,7 @@ public class InjectorForTopDownAnalyzerForJvm {
        this.bindingTrace = bindingTrace;
        this.moduleDescriptor = moduleDescriptor;
        this.builtinsScopeExtensionMode = builtinsScopeExtensionMode;
-        this.javaBridgeConfiguration = new JavaBridgeConfiguration();
+        this.moduleConfiguration = new JavaBridgeConfiguration();
        this.javaDescriptorResolver = new JavaDescriptorResolver();
        this.psiClassFinder = new PsiClassFinderImpl();
        this.namespaceFactory = new NamespaceFactoryImpl();
@@ -165,9 +161,9 @@ public class InjectorForTopDownAnalyzerForJvm {
        this.descriptorResolver.setExpressionTypingServices(expressionTypingServices);
        this.descriptorResolver.setTypeResolver(typeResolver);

-        this.javaBridgeConfiguration.setBuiltinsScopeExtensionMode(builtinsScopeExtensionMode);
-        this.javaBridgeConfiguration.setJavaSemanticServices(javaSemanticServices);
-        this.javaBridgeConfiguration.setProject(project);
+        this.moduleConfiguration.setBuiltinsScopeExtensionMode(builtinsScopeExtensionMode);
+        this.moduleConfiguration.setJavaSemanticServices(javaSemanticServices);
+        this.moduleConfiguration.setProject(project);

        javaDescriptorResolver.setJavaDescriptorSignatureResolver(javaDescriptorSignatureResolver);
        javaDescriptorResolver.setNamespaceFactory(namespaceFactory);
@@ -178,7 +174,7 @@ public class InjectorForTopDownAnalyzerForJvm {

        psiClassFinder.setProject(project);

-        this.namespaceFactory.setConfiguration(javaBridgeConfiguration);
+        this.namespaceFactory.setConfiguration(moduleConfiguration);
        this.namespaceFactory.setModuleDescriptor(moduleDescriptor);
        this.namespaceFactory.setTrace(bindingTrace);

@@ -206,7 +202,7 @@ public class InjectorForTopDownAnalyzerForJvm {
        typeResolver.setDescriptorResolver(descriptorResolver);
        typeResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver);

-        importsResolver.setConfiguration(javaBridgeConfiguration);
+        importsResolver.setConfiguration(moduleConfiguration);
        importsResolver.setContext(topDownAnalysisContext);
        importsResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver);
        importsResolver.setTrace(bindingTrace);
@@ -249,7 +245,7 @@ public class InjectorForTopDownAnalyzerForJvm {
        javaDescriptorSignatureResolver.setJavaDescriptorResolver(javaDescriptorResolver);
        javaDescriptorSignatureResolver.setJavaSemanticServices(javaSemanticServices);

-        javaBridgeConfiguration.init();
+        moduleConfiguration.init();

        psiClassFinder.initialize();

@@ -295,8 +291,8 @@ public class InjectorForTopDownAnalyzerForJvm {
        return this.bindingTrace;
    }

-    public JavaBridgeConfiguration getJavaBridgeConfiguration() {
-        return this.javaBridgeConfiguration;
+    public ModuleConfiguration getModuleConfiguration() {
+        return this.moduleConfiguration;
    }

    public NamespaceFactoryImpl getNamespaceFactory() {
@@ -23,7 +23,6 @@ import com.intellij.psi.impl.PsiFileFactoryImpl;
 import com.intellij.testFramework.LightVirtualFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
-import org.jetbrains.jet.JetTestCaseBuilder;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.di.InjectorForJavaSemanticServices;
@@ -65,7 +64,7 @@ public abstract class AbstractReadJavaBinaryClassTest extends TestCaseWithTmpdir
    }

    @NotNull
-    private NamespaceDescriptor compileKotlin() throws Exception {
+    private NamespaceDescriptor compileKotlin(File ktFile) throws Exception {
        JetCoreEnvironment jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable, ConfigurationKind.JDK_ONLY);

        String text = FileUtil.loadFile(ktFile);
@@ -95,7 +95,7 @@ public class AllInjectorsGenerator {
        generator.implementInterface(InjectorForTopDownAnalyzer.class);
        generateInjectorForTopDownAnalyzerCommon(generator);
        generator.addParameter(BuiltinsScopeExtensionMode.class);
-        generator.addPublicField(JavaBridgeConfiguration.class);
+        generator.addField(true, ModuleConfiguration.class, null, new InstantiateType(JavaBridgeConfiguration.class));
        generator.addField(JavaDescriptorResolver.class);
        generator.addField(PsiClassFinderImpl.class);
        generator.addPublicField(NamespaceFactoryImpl.class);
@@ -109,14 +109,13 @@ public class AllInjectorsGenerator {
        generator.addPublicParameter(Project.class);
        generator.addPublicParameter(BindingTrace.class);
        generator.addPublicParameter(ModuleDescriptor.class);
-        generator.addParameter(CompilerDependencies.class);
+        generator.addParameter(BuiltinsScopeExtensionMode.class);

        // Fields
        generator.addField(JavaBridgeConfiguration.class);
-        generator.addField(false, CompilerSpecialMode.class, null, new GivenExpression("compilerDependencies.getCompilerSpecialMode()"));
        generator.addPublicField(JavaSemanticServices.class);
        generator.addPublicField(JavaDescriptorResolver.class);
-        generator.addPublicField(PsiClassFinderForJvm.class);
+        generator.addPublicField(PsiClassFinderImpl.class);

        generator.generate("compiler/frontend.java/src", "org.jetbrains.jet.di", "InjectorForJavaDescriptorResolver");
    }
@@ -176,8 +175,8 @@ public class AllInjectorsGenerator {
        generator.addField(JavaBridgeConfiguration.class);
        generator.addPublicField(PsiClassFinderImpl.class);
        generator.addField(false, ModuleDescriptor.class, null,
-                new GivenExpression("new org.jetbrains.jet.lang.descriptors.ModuleDescriptor(" +
-                                    "org.jetbrains.jet.lang.resolve.name.Name.special(\"<dummy>\"))"));
+                           new GivenExpression("new org.jetbrains.jet.lang.descriptors.ModuleDescriptor(" +
+                                               "org.jetbrains.jet.lang.resolve.name.Name.special(\"<dummy>\"))"));
        generator.addParameter(BuiltinsScopeExtensionMode.class);

        // Parameters