Removed ModuleConfiguration.

2013-10-30 11:46:53 +04:00
parent 67f06c816b
commit d0605009ae
21 changed files with 9 additions and 131 deletions
@@ -103,7 +103,6 @@ public class ReplInterpreter {
                true,
                Collections.<AnalyzerScriptParameter>emptyList());
        injector = new InjectorForTopDownAnalyzerForJvm(project, topDownAnalysisParameters, trace, module);
-        module.setModuleConfiguration(injector.getJavaBridgeConfiguration());

        List<URL> classpath = Lists.newArrayList();

@@ -17,7 +17,6 @@
 package org.jetbrains.jet.di;

 import com.intellij.openapi.project.Project;
-import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.resolve.java.JavaClassFinderImpl;
 import org.jetbrains.jet.lang.resolve.java.resolver.TraceBasedExternalSignatureResolver;
@@ -28,7 +27,7 @@ import org.jetbrains.jet.lang.resolve.java.resolver.PsiBasedExternalAnnotationRe
 import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
 import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClassFinder;
 import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder;
-import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
+import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl;
 import org.jetbrains.jet.lang.resolve.java.resolver.JavaAnnotationResolver;
 import org.jetbrains.jet.lang.resolve.java.resolver.JavaAnnotationArgumentResolver;
 import org.jetbrains.jet.lang.resolve.java.resolver.JavaClassResolver;
@@ -27,7 +27,6 @@ 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.ModuleDescriptorImpl;
-import org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration;
 import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
 import org.jetbrains.jet.lang.resolve.java.mapping.JavaToKotlinClassMap;
 import org.jetbrains.jet.lang.resolve.java.JavaClassFinderImpl;
@@ -89,7 +88,6 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
    private final TopDownAnalysisParameters topDownAnalysisParameters;
    private final BindingTrace bindingTrace;
    private final ModuleDescriptorImpl moduleDescriptor;
-    private final JavaBridgeConfiguration javaBridgeConfiguration;
    private final JavaDescriptorResolver javaDescriptorResolver;
    private final JavaToKotlinClassMap javaToKotlinClassMap;
    private final JavaClassFinderImpl javaClassFinder;
@@ -152,7 +150,6 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
        this.topDownAnalysisParameters = topDownAnalysisParameters;
        this.bindingTrace = bindingTrace;
        this.moduleDescriptor = moduleDescriptor;
-        this.javaBridgeConfiguration = new JavaBridgeConfiguration();
        this.javaDescriptorResolver = new JavaDescriptorResolver();
        this.javaToKotlinClassMap = org.jetbrains.jet.lang.resolve.java.mapping.JavaToKotlinClassMap.getInstance();
        this.javaClassFinder = new JavaClassFinderImpl();
@@ -443,8 +440,4 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
        return this.moduleDescriptor;
    }
    
-    public JavaBridgeConfiguration getJavaBridgeConfiguration() {
-        return this.javaBridgeConfiguration;
-    }
-    
 }
@@ -104,7 +104,6 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade {

        ModuleDescriptorImpl module = injector.getModule();

-        module.setModuleConfiguration(DefaultModuleConfiguration.INSTANCE);
        module.addFragmentProvider(javaDescriptorResolver.getPackageFragmentProvider());
        if (addBuiltIns) {
            module.addFragmentProvider(KotlinBuiltIns.getInstance().getBuiltInsModule().getPackageFragmentProvider());
@@ -182,7 +181,6 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade {
        InjectorForTopDownAnalyzerForJvm injector = new InjectorForTopDownAnalyzerForJvm(
                project, topDownAnalysisParameters,
                new ObservableBindingTrace(trace), owner);
-        owner.setModuleConfiguration(injector.getJavaBridgeConfiguration());
        try {
            injector.getTopDownAnalyzer().analyzeFiles(files, scriptParameters);
            BodiesResolveContext bodiesResolveContext = storeContextForBodiesResolve ?
@@ -22,7 +22,6 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.di.InjectorForTopDownAnalyzerBasic;
-import org.jetbrains.jet.lang.ModuleConfiguration;
 import org.jetbrains.jet.lang.PlatformToKotlinClassMap;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.impl.*;
@@ -186,7 +185,6 @@ public class TopDownAnalyzer {
        ModuleDescriptorImpl moduleDescriptor = new ModuleDescriptorImpl(Name.special("<dummy for object>"),
                                                                         Collections.<ImportPath>emptyList(),
                                                                         PlatformToKotlinClassMap.EMPTY);
-        moduleDescriptor.setModuleConfiguration(ModuleConfiguration.EMPTY);

        TopDownAnalysisParameters topDownAnalysisParameters =
                new TopDownAnalysisParameters(Predicates.equalTo(object.getContainingFile()),
@@ -47,7 +47,6 @@ import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.jet.codegen.forTestCompile.ForTestPackJdkAnnotations;
 import org.jetbrains.jet.config.CommonConfigurationKeys;
 import org.jetbrains.jet.config.CompilerConfiguration;
-import org.jetbrains.jet.lang.ModuleConfiguration;
 import org.jetbrains.jet.lang.PlatformToKotlinClassMap;
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl;
 import org.jetbrains.jet.lang.descriptors.impl.MutablePackageFragmentDescriptor;
@@ -699,11 +698,7 @@ public class JetTestUtils {
    }

    public static ModuleDescriptorImpl createEmptyModule(@NotNull String name) {
-        ModuleDescriptorImpl descriptor = new ModuleDescriptorImpl(Name.special(name),
-                                                                   Collections.<ImportPath>emptyList(),
-                                                                   PlatformToKotlinClassMap.EMPTY);
-        descriptor.setModuleConfiguration(ModuleConfiguration.EMPTY);
-        return descriptor;
+        return new ModuleDescriptorImpl(Name.special(name), Collections.<ImportPath>emptyList(), PlatformToKotlinClassMap.EMPTY);
    }

    @NotNull
@@ -144,8 +144,6 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
        // we need the same binding trace for resolve from Java and Kotlin
        BindingTrace trace = CliLightClassGenerationSupport.getInstanceForCli(environment.getProject()).getTrace();

-        InjectorForJavaDescriptorResolver injectorForJava = new InjectorForJavaDescriptorResolver(environment.getProject(), trace);
-
        ModuleDescriptorImpl moduleDescriptor = AnalyzerFacadeForJVM.createJavaModule("<test module>");

        InjectorForTopDownAnalyzerForJvm injectorForAnalyzer = new InjectorForTopDownAnalyzerForJvm(
@@ -154,7 +152,6 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
                        Predicates.<PsiFile>alwaysFalse(), false, false, Collections.<AnalyzerScriptParameter>emptyList()),
                trace,
                moduleDescriptor);
-        moduleDescriptor.setModuleConfiguration(injectorForAnalyzer.getJavaBridgeConfiguration());

        injectorForAnalyzer.getTopDownAnalyzer().analyzeFiles(environment.getSourceFiles(), Collections.<AnalyzerScriptParameter>emptyList());

@@ -55,7 +55,6 @@ public abstract class AbstractLazyResolveDescriptorRendererTest extends KotlinTe
        Collection<JetFile> files = Lists.newArrayList(psiFile);

        final ModuleDescriptorImpl lazyModule = AnalyzerFacadeForJVM.createJavaModule("<lazy module>");
-        lazyModule.setModuleConfiguration(injectorForTopDownAnalyzer.getModuleDescriptor().getModuleConfiguration());
        LockBasedLazyResolveStorageManager storageManager = new LockBasedLazyResolveStorageManager();
        final ResolveSession resolveSession = new ResolveSession(getProject(), storageManager, lazyModule,
                                                                 new FileBasedDeclarationProviderFactory(storageManager, files));
@@ -63,9 +63,7 @@ public class LazyResolveTestUtil {
        TopDownAnalysisParameters params = new TopDownAnalysisParameters(
                Predicates.<PsiFile>alwaysTrue(), false, false, Collections.<AnalyzerScriptParameter>emptyList());
        BindingTrace sharedTrace = CliLightClassGenerationSupport.getInstanceForCli(environment.getProject()).getTrace();
-        InjectorForTopDownAnalyzerForJvm injector = new InjectorForTopDownAnalyzerForJvm(environment.getProject(), params, sharedTrace, module);
-        module.setModuleConfiguration(injector.getJavaBridgeConfiguration());
-        return injector;
+        return new InjectorForTopDownAnalyzerForJvm(environment.getProject(), params, sharedTrace, module);
    }

    public static ModuleDescriptor resolveEagerly(List<JetFile> files, JetCoreEnvironment environment) {