diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java index 1eb4464784d..8e0ee8f0e71 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java @@ -103,7 +103,6 @@ public class ReplInterpreter { true, Collections.emptyList()); injector = new InjectorForTopDownAnalyzerForJvm(project, topDownAnalysisParameters, trace, module); - module.setModuleConfiguration(injector.getJavaBridgeConfiguration()); List classpath = Lists.newArrayList(); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java index 29e03d0f5fb..5d28a340ffa 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java @@ -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; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java index 8b1f4110ba8..9718897bc13 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java @@ -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; - } - } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java index 91e3069accb..2daee60495d 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java @@ -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 ? diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java index 7a0a255112c..07f42c21831 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java @@ -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(""), Collections.emptyList(), PlatformToKotlinClassMap.EMPTY); - moduleDescriptor.setModuleConfiguration(ModuleConfiguration.EMPTY); TopDownAnalysisParameters topDownAnalysisParameters = new TopDownAnalysisParameters(Predicates.equalTo(object.getContainingFile()), diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index fcb44406dbd..20b95ffa301 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java @@ -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.emptyList(), - PlatformToKotlinClassMap.EMPTY); - descriptor.setModuleConfiguration(ModuleConfiguration.EMPTY); - return descriptor; + return new ModuleDescriptorImpl(Name.special(name), Collections.emptyList(), PlatformToKotlinClassMap.EMPTY); } @NotNull diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index 7174aa5c14c..8735ad3d401 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -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(""); InjectorForTopDownAnalyzerForJvm injectorForAnalyzer = new InjectorForTopDownAnalyzerForJvm( @@ -154,7 +152,6 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { Predicates.alwaysFalse(), false, false, Collections.emptyList()), trace, moduleDescriptor); - moduleDescriptor.setModuleConfiguration(injectorForAnalyzer.getJavaBridgeConfiguration()); injectorForAnalyzer.getTopDownAnalyzer().analyzeFiles(environment.getSourceFiles(), Collections.emptyList()); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java index c98cca9855f..1f41172496d 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java @@ -55,7 +55,6 @@ public abstract class AbstractLazyResolveDescriptorRendererTest extends KotlinTe Collection files = Lists.newArrayList(psiFile); final ModuleDescriptorImpl lazyModule = AnalyzerFacadeForJVM.createJavaModule(""); - lazyModule.setModuleConfiguration(injectorForTopDownAnalyzer.getModuleDescriptor().getModuleConfiguration()); LockBasedLazyResolveStorageManager storageManager = new LockBasedLazyResolveStorageManager(); final ResolveSession resolveSession = new ResolveSession(getProject(), storageManager, lazyModule, new FileBasedDeclarationProviderFactory(storageManager, files)); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java index d42c0a44d31..315acc343d0 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java @@ -63,9 +63,7 @@ public class LazyResolveTestUtil { TopDownAnalysisParameters params = new TopDownAnalysisParameters( Predicates.alwaysTrue(), false, false, Collections.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 files, JetCoreEnvironment environment) { diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java index 306867f20cc..148b6b5b9fc 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java @@ -16,21 +16,15 @@ package org.jetbrains.jet.lang.resolve.java; -import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.DefaultModuleConfiguration; -import org.jetbrains.jet.lang.ModuleConfiguration; -import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.resolve.ImportPath; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.resolve.scopes.WritableScope; -import javax.inject.Inject; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -public class JavaBridgeConfiguration implements ModuleConfiguration { +public class JavaBridgeConfiguration { public static final List DEFAULT_JAVA_IMPORTS = Collections.unmodifiableList(Arrays.asList(new ImportPath("java.lang.*"))); public static final List ALL_JAVA_IMPORTS; @@ -41,8 +35,4 @@ public class JavaBridgeConfiguration implements ModuleConfiguration { allJavaImports.addAll(DefaultModuleConfiguration.DEFAULT_JET_IMPORTS); ALL_JAVA_IMPORTS = Collections.unmodifiableList(allJavaImports); } - - @Override - public void extendNamespaceScope(@NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope) { - } } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java b/core/descriptors/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java index 919742d028d..07bc9da8ec0 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java @@ -17,25 +17,16 @@ package org.jetbrains.jet.lang; import com.google.common.collect.ImmutableList; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.resolve.ImportPath; -import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import java.util.List; -public class DefaultModuleConfiguration implements ModuleConfiguration { +public class DefaultModuleConfiguration { public static final List DEFAULT_JET_IMPORTS = ImmutableList.of( new ImportPath("kotlin.*"), new ImportPath("kotlin.io.*"), new ImportPath("jet.*")); - public static final ModuleConfiguration INSTANCE = new DefaultModuleConfiguration(); - private DefaultModuleConfiguration() { } - - @Override - public void extendNamespaceScope(@NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope) { - } } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/ModuleConfiguration.java b/core/descriptors/src/org/jetbrains/jet/lang/ModuleConfiguration.java deleted file mode 100644 index aab0595ecbd..00000000000 --- a/core/descriptors/src/org/jetbrains/jet/lang/ModuleConfiguration.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2010-2013 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; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; -import org.jetbrains.jet.lang.resolve.scopes.WritableScope; - -public interface ModuleConfiguration { - ModuleConfiguration EMPTY = new ModuleConfiguration() { - @Override - public void extendNamespaceScope(@NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope) { - } - - @Override - public String toString() { - return "EMPTY"; - } - }; - - /** - * This method is called every time a namespace descriptor is created. Use it to add extra descriptors to the namespace, e.g. merge a - * Java package with a Kotlin one - */ - void extendNamespaceScope(@NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope); -} diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.java index 219169ee0a5..8b60ccf6d46 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.java @@ -18,7 +18,6 @@ package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.ModuleConfiguration; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.descriptors.impl.NamespaceDescriptorParent; import org.jetbrains.jet.lang.resolve.ImportPath; @@ -38,9 +37,6 @@ public interface ModuleDescriptor extends DeclarationDescriptor, NamespaceDescri @Nullable PackageViewDescriptor getPackage(@NotNull FqName fqName); - @NotNull - ModuleConfiguration getModuleConfiguration(); - @NotNull List getDefaultImports(); diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptorImpl.java index b01288474be..ebf7c51b148 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptorImpl.java @@ -19,7 +19,6 @@ package org.jetbrains.jet.lang.descriptors; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.ModuleConfiguration; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.descriptors.impl.CompositePackageFragmentProvider; @@ -36,7 +35,6 @@ import java.util.List; public class ModuleDescriptorImpl extends DeclarationDescriptorImpl implements ModuleDescriptor { private final List fragmentProviders = Lists.newArrayList(); private final CompositePackageFragmentProvider packageFragmentProvider = new CompositePackageFragmentProvider(fragmentProviders); - private ModuleConfiguration moduleConfiguration; private final List defaultImports; private final PlatformToKotlinClassMap platformToKotlinClassMap; @@ -78,19 +76,6 @@ public class ModuleDescriptorImpl extends DeclarationDescriptorImpl implements M : null; } - @NotNull - @Override - public ModuleConfiguration getModuleConfiguration() { - return moduleConfiguration; - } - - @NotNull - public ModuleDescriptorImpl setModuleConfiguration(@NotNull ModuleConfiguration moduleConfiguration) { - assert this.moduleConfiguration == null : "Trying to set module configuration twice for " + this; - this.moduleConfiguration = moduleConfiguration; - return this; - } - @NotNull @Override public List getDefaultImports() { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java b/core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java index a4dc43ced62..8b268e22d7b 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java @@ -18,7 +18,6 @@ package org.jetbrains.jet.lang.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.ModuleConfiguration; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; @@ -42,13 +41,11 @@ public class ErrorUtils { private static final ModuleDescriptor ERROR_MODULE; static { - ModuleDescriptorImpl module = new ModuleDescriptorImpl( + ERROR_MODULE = new ModuleDescriptorImpl( Name.special(""), Collections.emptyList(), PlatformToKotlinClassMap.EMPTY ); - module.setModuleConfiguration(ModuleConfiguration.EMPTY); - ERROR_MODULE = module; } public static boolean containsErrorType(@NotNull FunctionDescriptor function) { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java index 47253534145..ede348c6a3e 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java @@ -21,7 +21,6 @@ import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.DefaultModuleConfiguration; -import org.jetbrains.jet.lang.ModuleConfiguration; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; @@ -131,7 +130,6 @@ public class KotlinBuiltIns { this.builtInsModule = new ModuleDescriptorImpl(Name.special(""), DefaultModuleConfiguration.DEFAULT_JET_IMPORTS, PlatformToKotlinClassMap.EMPTY); - builtInsModule.setModuleConfiguration(ModuleConfiguration.EMPTY); loadBuiltIns(builtInsModule); this.functionClassesSet = computeIndexedClasses("Function", FUNCTION_TRAIT_COUNT); diff --git a/generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.java b/generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.java index 3b29eee5131..75590ad31ba 100644 --- a/generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.java +++ b/generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.java @@ -31,7 +31,6 @@ import org.jetbrains.jet.lang.psi.JetImportsFactory; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.calls.CallResolver; import org.jetbrains.jet.lang.resolve.calls.CallResolverExtensionProvider; -import org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration; import org.jetbrains.jet.lang.resolve.java.JavaClassFinderImpl; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; import org.jetbrains.jet.lang.resolve.java.mapping.JavaToKotlinClassMap; @@ -125,7 +124,6 @@ public class GenerateInjectors { DependencyInjectorGenerator generator = new DependencyInjectorGenerator(); generator.implementInterface(InjectorForTopDownAnalyzer.class); generateInjectorForTopDownAnalyzerCommon(generator); - generator.addPublicField(JavaBridgeConfiguration.class); generator.addField(JavaDescriptorResolver.class); generator.addField(false, JavaToKotlinClassMap.class, null, new GivenExpression("org.jetbrains.jet.lang.resolve.java.mapping.JavaToKotlinClassMap.getInstance()")); generator.addField(JavaClassFinderImpl.class); diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java b/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java index 4329a2e2ff0..017f5143eb0 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java @@ -224,7 +224,6 @@ public class JetSourceNavigationHelper { ModuleDescriptorImpl moduleDescriptor = new ModuleDescriptorImpl(Name.special(""), DefaultModuleConfiguration.DEFAULT_JET_IMPORTS, PlatformToKotlinClassMap.EMPTY); - moduleDescriptor.setModuleConfiguration(DefaultModuleConfiguration.INSTANCE); KotlinCodeAnalyzer analyzer = new ResolveSession( project, storageManager, diff --git a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java index 40eb4b5a4c6..179a76d15f6 100644 --- a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java +++ b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java @@ -32,7 +32,6 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.asJava.LightClassUtil; -import org.jetbrains.jet.lang.ModuleConfiguration; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; @@ -236,8 +235,7 @@ public class BuiltInsReferenceResolver extends AbstractProjectComponent { private FakeJetNamespaceDescriptor() { super(new NamespaceDescriptorImpl( - new ModuleDescriptorImpl(Name.special(""), Collections.emptyList(), PlatformToKotlinClassMap.EMPTY) - .setModuleConfiguration(ModuleConfiguration.EMPTY), + new ModuleDescriptorImpl(Name.special(""), Collections.emptyList(), PlatformToKotlinClassMap.EMPTY), Collections.emptyList(), Name.special("")), Collections.emptyList(), KotlinBuiltIns.BUILT_INS_PACKAGE_NAME); } diff --git a/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java b/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java index 68e877acfa8..0c3bccbaec6 100644 --- a/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java +++ b/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java @@ -93,7 +93,6 @@ public final class AnalyzerFacadeForJS { BindingTrace trace = libraryContext == null ? new BindingTraceContext() : new DelegatingBindingTrace(libraryContext, "trace with preanalyzed library"); - owner.setModuleConfiguration(new JsConfiguration()); InjectorForTopDownAnalyzerForJs injector = new InjectorForTopDownAnalyzerForJs(project, topDownAnalysisParameters, trace, owner); try { Collection allFiles = libraryModule != null ? @@ -148,9 +147,7 @@ public final class AnalyzerFacadeForJS { LockBasedLazyResolveStorageManager storageManager = new LockBasedLazyResolveStorageManager(); FileBasedDeclarationProviderFactory declarationProviderFactory = new FileBasedDeclarationProviderFactory( storageManager, Config.withJsLibAdded(files, config), Predicates.alwaysFalse()); - ModuleDescriptorImpl lazyModule = createJsModule(""); - lazyModule.setModuleConfiguration(new JsConfiguration()); - return new ResolveSession(config.getProject(), storageManager, lazyModule, declarationProviderFactory); + return new ResolveSession(config.getProject(), storageManager, createJsModule(""), declarationProviderFactory); } @NotNull diff --git a/js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java b/js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java index 91eec332ed1..074849e9c50 100644 --- a/js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java +++ b/js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java @@ -18,15 +18,12 @@ package org.jetbrains.k2js.analyze; import com.google.common.collect.ImmutableList; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.ModuleConfiguration; -import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.resolve.ImportPath; -import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import java.util.List; -public class JsConfiguration implements ModuleConfiguration { +public class JsConfiguration { @NotNull public static final List DEFAULT_IMPORT_PATHS = ImmutableList.of( @@ -37,8 +34,4 @@ public class JsConfiguration implements ModuleConfiguration { JsConfiguration() { } - - @Override - public void extendNamespaceScope(@NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope) { - } }