From 2e44996cd07d1b48f21f740be273e2d25c2a1e32 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Tue, 16 Apr 2013 17:25:14 +0400 Subject: [PATCH] ModuleDescriptor interface extracted --- .../jet/cli/jvm/repl/ReplInterpreter.java | 6 +- .../di/InjectorForJavaSemanticServices.java | 6 +- .../di/InjectorForTopDownAnalyzerForJvm.java | 6 +- .../resolve/java/AnalyzerFacadeForJVM.java | 7 +- .../java/resolver/JavaNamespaceResolver.java | 3 +- .../di/InjectorForTopDownAnalyzerBasic.java | 6 +- .../lang/descriptors/ModuleDescriptor.java | 54 ++----------- .../descriptors/ModuleDescriptorImpl.java | 81 +++++++++++++++++++ .../jet/lang/resolve/DescriptorUtils.java | 4 +- .../lang/resolve/NamespaceFactoryImpl.java | 8 +- .../jet/lang/resolve/TopDownAnalyzer.java | 2 +- .../jet/lang/resolve/lazy/ResolveSession.java | 6 +- .../jetbrains/jet/lang/types/ErrorUtils.java | 2 +- .../jet/lang/types/lang/KotlinBuiltIns.java | 6 +- .../jvm/compiler/AbstractLoadJavaTest.java | 4 +- ...ractLazyResolveDescriptorRendererTest.java | 2 +- .../resolve/lazy/LazyResolveTestUtil.java | 11 +-- .../JetDefaultModalityModifiersTest.java | 2 +- .../jetbrains/jet/types/JetOverloadTest.java | 3 +- .../jet/types/JetOverridingTest.java | 3 +- .../injectors/GenerateInjectors.java | 12 ++- .../KotlinSignatureInJavaMarkerProvider.java | 7 +- .../libraries/JetSourceNavigationHelper.java | 4 +- .../references/BuiltInsReferenceResolver.java | 2 +- .../di/InjectorForTopDownAnalyzerForJs.java | 6 +- .../k2js/analyze/AnalyzerFacadeForJS.java | 6 +- 26 files changed, 151 insertions(+), 108 deletions(-) create mode 100644 compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptorImpl.java 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 97c436f9a93..62b813e2dd2 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 @@ -40,7 +40,7 @@ import org.jetbrains.jet.codegen.CompilationErrorHandler; import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.di.InjectorForTopDownAnalyzerForJvm; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl; import org.jetbrains.jet.lang.descriptors.impl.NamespaceDescriptorImpl; import org.jetbrains.jet.lang.descriptors.impl.NamespaceLikeBuilderDummy; import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; @@ -82,13 +82,13 @@ public class ReplInterpreter { @NotNull private final BindingTraceContext trace; @NotNull - private final ModuleDescriptor module; + private final ModuleDescriptorImpl module; public ReplInterpreter(@NotNull Disposable disposable, @NotNull CompilerConfiguration configuration) { jetCoreEnvironment = new JetCoreEnvironment(disposable, configuration); Project project = jetCoreEnvironment.getProject(); trace = new BindingTraceContext(); - module = new ModuleDescriptor(Name.special("")); + module = new ModuleDescriptorImpl(Name.special("")); TopDownAnalysisParameters topDownAnalysisParameters = new TopDownAnalysisParameters( Predicates.alwaysTrue(), false, diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java index 71a0cca4d9f..85a038c9279 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java @@ -21,7 +21,7 @@ import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration; import org.jetbrains.jet.lang.resolve.java.PsiClassFinderImpl; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl; import com.intellij.openapi.project.Project; import org.jetbrains.jet.lang.resolve.java.provider.PsiDeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.java.JavaTypeTransformer; @@ -48,7 +48,7 @@ public class InjectorForJavaSemanticServices { private BindingTrace bindingTrace; private JavaBridgeConfiguration javaBridgeConfiguration; private PsiClassFinderImpl psiClassFinder; - private ModuleDescriptor moduleDescriptor; + private ModuleDescriptorImpl moduleDescriptor; private final Project project; private PsiDeclarationProviderFactory psiDeclarationProviderFactory; private JavaTypeTransformer javaTypeTransformer; @@ -73,7 +73,7 @@ public class InjectorForJavaSemanticServices { this.bindingTrace = new org.jetbrains.jet.lang.resolve.BindingTraceContext(); this.javaBridgeConfiguration = new JavaBridgeConfiguration(); this.psiClassFinder = new PsiClassFinderImpl(); - this.moduleDescriptor = new org.jetbrains.jet.lang.descriptors.ModuleDescriptor(org.jetbrains.jet.lang.resolve.name.Name.special("")); + this.moduleDescriptor = new org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl(org.jetbrains.jet.lang.resolve.name.Name.special("")); this.project = project; this.psiDeclarationProviderFactory = new PsiDeclarationProviderFactory(getPsiClassFinder()); this.javaTypeTransformer = new JavaTypeTransformer(); 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 49e7db9f54d..30c8bff23bf 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorResolver; 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.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.PsiClassFinderImpl; @@ -77,7 +77,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly private final Project project; private final TopDownAnalysisParameters topDownAnalysisParameters; private final BindingTrace bindingTrace; - private final ModuleDescriptor moduleDescriptor; + private final ModuleDescriptorImpl moduleDescriptor; private JavaBridgeConfiguration moduleConfiguration; private JavaDescriptorResolver javaDescriptorResolver; private PsiClassFinderImpl psiClassFinder; @@ -118,7 +118,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly @NotNull Project project, @NotNull TopDownAnalysisParameters topDownAnalysisParameters, @NotNull BindingTrace bindingTrace, - @NotNull ModuleDescriptor moduleDescriptor + @NotNull ModuleDescriptorImpl moduleDescriptor ) { this.topDownAnalyzer = new TopDownAnalyzer(); this.topDownAnalysisContext = new TopDownAnalysisContext(); 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 51e41f50798..96206a2d7eb 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 @@ -32,6 +32,7 @@ import org.jetbrains.jet.lang.DefaultModuleConfiguration; import org.jetbrains.jet.lang.ModuleConfiguration; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.*; @@ -82,7 +83,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { @NotNull @Override public ResolveSession getLazyResolveSession(@NotNull Project fileProject, @NotNull Collection files) { - ModuleDescriptor javaModule = new ModuleDescriptor(Name.special("")); + ModuleDescriptor javaModule = new ModuleDescriptorImpl(Name.special("")); BindingTraceContext javaResolverTrace = new BindingTraceContext(); InjectorForJavaDescriptorResolver injector = new InjectorForJavaDescriptorResolver(fileProject, javaResolverTrace, javaModule); @@ -132,7 +133,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { } }; - ModuleDescriptor lazyModule = new ModuleDescriptor(Name.special("")); + ModuleDescriptorImpl lazyModule = new ModuleDescriptorImpl(Name.special("")); return new ResolveSession(fileProject, storageManager, lazyModule, moduleConfiguration, declarationProviderFactory, javaResolverTrace); } @@ -199,7 +200,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { Predicate filesToAnalyzeCompletely, boolean storeContextForBodiesResolve ) { - ModuleDescriptor owner = new ModuleDescriptor(Name.special("")); + ModuleDescriptorImpl owner = new ModuleDescriptorImpl(Name.special("")); TopDownAnalysisParameters topDownAnalysisParameters = new TopDownAnalysisParameters( filesToAnalyzeCompletely, false, false, scriptParameters); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java index dc57160d19e..35ced73cc4b 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java @@ -26,6 +26,7 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.descriptors.impl.NamespaceDescriptorParent; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; @@ -50,7 +51,7 @@ import java.util.Set; public final class JavaNamespaceResolver { @NotNull - public static final ModuleDescriptor FAKE_ROOT_MODULE = new ModuleDescriptor(JavaDescriptorResolver.JAVA_ROOT); + public static final ModuleDescriptor FAKE_ROOT_MODULE = new ModuleDescriptorImpl(JavaDescriptorResolver.JAVA_ROOT); @NotNull private final Map resolvedNamespaceCache = Maps.newHashMap(); @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java index 7b37d212956..d13c8b351b6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorResolver; 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.descriptors.ModuleDescriptorImpl; import org.jetbrains.jet.lang.ModuleConfiguration; import org.jetbrains.jet.lang.types.DependencyClassByQualifiedNameResolverDummyImpl; import org.jetbrains.jet.lang.resolve.NamespaceFactoryImpl; @@ -60,7 +60,7 @@ public class InjectorForTopDownAnalyzerBasic { private final Project project; private final TopDownAnalysisParameters topDownAnalysisParameters; private final BindingTrace bindingTrace; - private final ModuleDescriptor moduleDescriptor; + private final ModuleDescriptorImpl moduleDescriptor; private final ModuleConfiguration moduleConfiguration; private DependencyClassByQualifiedNameResolverDummyImpl dependencyClassByQualifiedNameResolverDummy; private NamespaceFactoryImpl namespaceFactory; @@ -85,7 +85,7 @@ public class InjectorForTopDownAnalyzerBasic { @NotNull Project project, @NotNull TopDownAnalysisParameters topDownAnalysisParameters, @NotNull BindingTrace bindingTrace, - @NotNull ModuleDescriptor moduleDescriptor, + @NotNull ModuleDescriptorImpl moduleDescriptor, @NotNull ModuleConfiguration moduleConfiguration ) { this.topDownAnalyzer = new TopDownAnalyzer(); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.java index d699fe6085c..02ffc8b9f84 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.java @@ -18,64 +18,20 @@ package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.DeclarationDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.NamespaceDescriptorImpl; import org.jetbrains.jet.lang.descriptors.impl.NamespaceDescriptorParent; -import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.TypeSubstitutor; -import java.util.Collections; - -public class ModuleDescriptor extends DeclarationDescriptorImpl implements ClassOrNamespaceDescriptor, NamespaceDescriptorParent { - private NamespaceDescriptor rootNamepsace; - - public ModuleDescriptor(@NotNull Name name) { - super(Collections.emptyList(), name); - if (!name.isSpecial()) { - throw new IllegalArgumentException("module name must be special: " + name); - } - } - - public void setRootNamespace(@NotNull NamespaceDescriptor rootNs) { - if (this.rootNamepsace != null) { - throw new IllegalStateException("setRootNamespace() is called twice"); - } - this.rootNamepsace = rootNs; - } - +public interface ModuleDescriptor extends DeclarationDescriptor, NamespaceDescriptorParent { @Override @Nullable - public DeclarationDescriptor getContainingDeclaration() { - return null; - } + DeclarationDescriptor getContainingDeclaration(); - public NamespaceDescriptor getRootNamespace() { - return rootNamepsace; - } - - public NamespaceDescriptorImpl getRootNamespaceDescriptorImpl() { - return (NamespaceDescriptorImpl) rootNamepsace; - } + NamespaceDescriptor getRootNamespace(); @NotNull @Override - public ModuleDescriptor substitute(@NotNull TypeSubstitutor substitutor) { - return this; - } + ModuleDescriptor substitute(@NotNull TypeSubstitutor substitutor); @Override - public R accept(DeclarationDescriptorVisitor visitor, D data) { - return visitor.visitModuleDeclaration(this, data); - } - - - @Override - public void addNamespace(@NotNull NamespaceDescriptor namespaceDescriptor) { - if (namespaceDescriptor.getContainingDeclaration() != this) { - throw new IllegalStateException(); - } - setRootNamespace(namespaceDescriptor); - } - + R accept(DeclarationDescriptorVisitor visitor, D data); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptorImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptorImpl.java new file mode 100644 index 00000000000..bfc88c3504b --- /dev/null +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptorImpl.java @@ -0,0 +1,81 @@ +/* + * 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.descriptors; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.jet.lang.descriptors.impl.DeclarationDescriptorImpl; +import org.jetbrains.jet.lang.descriptors.impl.NamespaceDescriptorImpl; +import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.jet.lang.types.TypeSubstitutor; + +import java.util.Collections; + +public class ModuleDescriptorImpl extends DeclarationDescriptorImpl implements ClassOrNamespaceDescriptor, ModuleDescriptor { + private NamespaceDescriptor rootNamepsace; + + public ModuleDescriptorImpl(@NotNull Name name) { + super(Collections.emptyList(), name); + if (!name.isSpecial()) { + throw new IllegalArgumentException("module name must be special: " + name); + } + } + + public void setRootNamespace(@NotNull NamespaceDescriptor rootNs) { + if (this.rootNamepsace != null) { + throw new IllegalStateException("setRootNamespace() is called twice"); + } + this.rootNamepsace = rootNs; + } + + @Override + @Nullable + public DeclarationDescriptor getContainingDeclaration() { + return null; + } + + @Override + public NamespaceDescriptor getRootNamespace() { + return rootNamepsace; + } + + public NamespaceDescriptorImpl getRootNamespaceDescriptorImpl() { + return (NamespaceDescriptorImpl) rootNamepsace; + } + + @NotNull + @Override + public ModuleDescriptor substitute(@NotNull TypeSubstitutor substitutor) { + return this; + } + + @Override + public R accept(DeclarationDescriptorVisitor visitor, D data) { + return visitor.visitModuleDeclaration(this, data); + } + + + @Override + public void addNamespace(@NotNull NamespaceDescriptor namespaceDescriptor) { + if (namespaceDescriptor.getContainingDeclaration() != this) { + throw new IllegalStateException(); + } + setRootNamespace(namespaceDescriptor); + } + +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java index 597e10eb3f2..368cf5ecfe9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java @@ -150,8 +150,8 @@ public class DescriptorUtils { } public static boolean isInSameModule(@NotNull DeclarationDescriptor first, @NotNull DeclarationDescriptor second) { - ModuleDescriptor parentModule = DescriptorUtils.getParentOfType(first, ModuleDescriptor.class, false); - ModuleDescriptor fromModule = DescriptorUtils.getParentOfType(second, ModuleDescriptor.class, false); + ModuleDescriptor parentModule = DescriptorUtils.getParentOfType(first, ModuleDescriptorImpl.class, false); + ModuleDescriptor fromModule = DescriptorUtils.getParentOfType(second, ModuleDescriptorImpl.class, false); assert parentModule != null && fromModule != null; return parentModule.equals(fromModule); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/NamespaceFactoryImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/NamespaceFactoryImpl.java index 6b120b5aa7e..e9439743052 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/NamespaceFactoryImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/NamespaceFactoryImpl.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.ModuleConfiguration; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.descriptors.impl.NamespaceDescriptorImpl; import org.jetbrains.jet.lang.descriptors.impl.NamespaceDescriptorParent; @@ -43,12 +43,12 @@ import static org.jetbrains.jet.lang.resolve.BindingContext.*; public class NamespaceFactoryImpl implements NamespaceFactory { - private ModuleDescriptor moduleDescriptor; + private ModuleDescriptorImpl moduleDescriptor; private BindingTrace trace; private ModuleConfiguration configuration; @Inject - public void setModuleDescriptor(ModuleDescriptor moduleDescriptor) { + public void setModuleDescriptor(ModuleDescriptorImpl moduleDescriptor) { this.moduleDescriptor = moduleDescriptor; } @@ -136,7 +136,7 @@ public class NamespaceFactoryImpl implements NamespaceFactory { } private NamespaceDescriptorImpl createRootNamespaceDescriptorIfNeeded(@Nullable JetFile file, - @NotNull ModuleDescriptor owner, + @NotNull ModuleDescriptorImpl owner, @Nullable JetReferenceExpression expression, @NotNull RedeclarationHandler handler) { FqName fqName = FqName.ROOT; 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 baddf410dfb..91f3c5a36f1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java @@ -186,7 +186,7 @@ public class TopDownAnalyzer { @NotNull final DeclarationDescriptor containingDeclaration, @NotNull JetClassOrObject object ) { - ModuleDescriptor moduleDescriptor = new ModuleDescriptor(Name.special("")); + ModuleDescriptorImpl moduleDescriptor = new ModuleDescriptorImpl(Name.special("")); TopDownAnalysisParameters topDownAnalysisParameters = new TopDownAnalysisParameters(Predicates.equalTo(object.getContainingFile()), diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java index d03f9442648..90a202f98f5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java @@ -72,7 +72,7 @@ public class ResolveSession implements KotlinCodeAnalyzer { public ResolveSession( @NotNull Project project, @NotNull StorageManager storageManager, - @NotNull ModuleDescriptor rootDescriptor, + @NotNull ModuleDescriptorImpl rootDescriptor, @NotNull ModuleConfiguration moduleConfiguration, @NotNull DeclarationProviderFactory declarationProviderFactory ) { @@ -84,7 +84,7 @@ public class ResolveSession implements KotlinCodeAnalyzer { public ResolveSession( @NotNull Project project, @NotNull StorageManager storageManager, - @NotNull ModuleDescriptor rootDescriptor, + @NotNull ModuleDescriptorImpl rootDescriptor, @NotNull ModuleConfiguration moduleConfiguration, @NotNull DeclarationProviderFactory declarationProviderFactory, @NotNull BindingTrace delegationTrace @@ -103,7 +103,7 @@ public class ResolveSession implements KotlinCodeAnalyzer { public ResolveSession( @NotNull Project project, @NotNull StorageManager storageManager, - @NotNull ModuleDescriptor rootDescriptor, + @NotNull ModuleDescriptorImpl rootDescriptor, @NotNull ModuleConfiguration moduleConfiguration, @NotNull DeclarationProviderFactory declarationProviderFactory, @NotNull Function classifierAliases, diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/ErrorUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/ErrorUtils.java index 6a2214a9db3..1cc7c44766e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/ErrorUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/ErrorUtils.java @@ -31,7 +31,7 @@ import java.util.*; public class ErrorUtils { - private static final ModuleDescriptor ERROR_MODULE = new ModuleDescriptor(Name.special("")); + private static final ModuleDescriptor ERROR_MODULE = new ModuleDescriptorImpl(Name.special("")); public static class ErrorScope implements JetScope { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java index 935af5e9e10..2996d6c875c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java @@ -138,7 +138,7 @@ public class KotlinBuiltIns { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// private final KotlinCodeAnalyzer analyzer; - private final ModuleDescriptor builtInsModule; + private final ModuleDescriptorImpl builtInsModule; private volatile ImmutableSet nonPhysicalClasses; @@ -170,7 +170,7 @@ public class KotlinBuiltIns { private KotlinBuiltIns(@NotNull Project project) { try { - this.builtInsModule = new ModuleDescriptor(Name.special("")); + this.builtInsModule = new ModuleDescriptorImpl(Name.special("")); this.analyzer = createLazyResolveSession(project); this.functionClassesSet = computeIndexedClasses("Function", FUNCTION_TRAIT_COUNT); @@ -298,7 +298,7 @@ public class KotlinBuiltIns { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @NotNull - public ModuleDescriptor getBuiltInsModule() { + public ModuleDescriptorImpl getBuiltInsModule() { return builtInsModule; } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index 3ab3fa6aa7b..53d1360feab 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.di.InjectorForJavaDescriptorResolver; import org.jetbrains.jet.di.InjectorForTopDownAnalyzerForJvm; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.BindingContext; @@ -138,7 +138,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { configuration.put(CommonConfigurationKeys.SOURCE_ROOTS_KEY, Arrays.asList(sourcesDir.getAbsolutePath())); JetCoreEnvironment environment = new JetCoreEnvironment(getTestRootDisposable(), configuration); - ModuleDescriptor moduleDescriptor = new ModuleDescriptor(Name.special("")); + ModuleDescriptorImpl moduleDescriptor = new ModuleDescriptorImpl(Name.special("")); // we need the same binding trace for resolve from Java and Kotlin BindingTrace trace = CliLightClassGenerationSupport.getInstanceForCli(environment.getProject()).getTrace(); 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 497c5fb2621..30a52665e1c 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java @@ -54,7 +54,7 @@ public abstract class AbstractLazyResolveDescriptorRendererTest extends KotlinTe JetFile psiFile = JetPsiFactory.createFile(getProject(), FileUtil.loadFile(new File(testFile), true)); Collection files = Lists.newArrayList(psiFile); - ModuleDescriptor lazyModule = new ModuleDescriptor(Name.special("")); + ModuleDescriptorImpl lazyModule = new ModuleDescriptorImpl(Name.special("")); LockBasedStorageManager storageManager = new LockBasedStorageManager(); final ResolveSession resolveSession = new ResolveSession(getProject(), storageManager, lazyModule, injectorForTopDownAnalyzer.getModuleConfiguration(), 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 c1c854062b7..cf4226e54d1 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java @@ -33,6 +33,7 @@ import org.jetbrains.jet.lang.DefaultModuleConfiguration; import org.jetbrains.jet.lang.ModuleConfiguration; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetNamespaceHeader; @@ -59,7 +60,7 @@ public class LazyResolveTestUtil { } public static InjectorForTopDownAnalyzer getEagerInjectorForTopDownAnalyzer(JetCoreEnvironment environment) { - ModuleDescriptor eagerModuleForLazy = new ModuleDescriptor(Name.special("")); + ModuleDescriptorImpl eagerModuleForLazy = new ModuleDescriptorImpl(Name.special("")); InjectorForTopDownAnalyzer tdaInjectorForLazy = createInjectorForTDA(eagerModuleForLazy, environment); // This line is required fro the 'jet' namespace to be filled in with functions @@ -68,7 +69,7 @@ public class LazyResolveTestUtil { return tdaInjectorForLazy; } - public static InjectorForTopDownAnalyzer createInjectorForTDA(ModuleDescriptor module, JetCoreEnvironment environment) { + public static InjectorForTopDownAnalyzer createInjectorForTDA(ModuleDescriptorImpl module, JetCoreEnvironment environment) { JetTestUtils.newTrace(environment); TopDownAnalysisParameters params = new TopDownAnalysisParameters( @@ -78,7 +79,7 @@ public class LazyResolveTestUtil { } public static ModuleDescriptor resolveEagerly(List files, JetCoreEnvironment environment) { - ModuleDescriptor module = new ModuleDescriptor(Name.special("")); + ModuleDescriptorImpl module = new ModuleDescriptorImpl(Name.special("")); InjectorForTopDownAnalyzer injector = createInjectorForTDA(module, environment); injector.getTopDownAnalyzer().analyzeFiles(files, Collections.emptyList()); return module; @@ -87,7 +88,7 @@ public class LazyResolveTestUtil { public static KotlinCodeAnalyzer resolveLazilyWithSession(List files, JetCoreEnvironment environment) { JetTestUtils.newTrace(environment); - ModuleDescriptor javaModule = new ModuleDescriptor(Name.special("")); + ModuleDescriptor javaModule = new ModuleDescriptorImpl(Name.special("")); Project project = environment.getProject(); BindingTrace sharedTrace = CliLightClassGenerationSupport.getInstanceForCli(environment.getProject()).getTrace(); @@ -137,7 +138,7 @@ public class LazyResolveTestUtil { } }; - ModuleDescriptor lazyModule = new ModuleDescriptor(Name.special("")); + ModuleDescriptorImpl lazyModule = new ModuleDescriptorImpl(Name.special("")); return new ResolveSession(project, storageManager, lazyModule, moduleConfiguration, declarationProviderFactory, sharedTrace); } diff --git a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java index 0acd7eefc02..fd3c07dd924 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java @@ -60,7 +60,7 @@ public class JetDefaultModalityModifiersTest extends JetLiteFixture { } public class JetDefaultModalityModifiersTestCase { - private ModuleDescriptor root = new ModuleDescriptor(Name.special("")); + private ModuleDescriptor root = new ModuleDescriptorImpl(Name.special("")); private DescriptorResolver descriptorResolver; private JetScope scope; diff --git a/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java b/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java index f116a02f516..dc533817232 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java @@ -24,6 +24,7 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.di.InjectorForTests; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl; import org.jetbrains.jet.lang.psi.JetNamedFunction; import org.jetbrains.jet.lang.psi.JetPsiFactory; import org.jetbrains.jet.lang.resolve.DescriptorResolver; @@ -33,7 +34,7 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; public class JetOverloadTest extends JetLiteFixture { - private ModuleDescriptor root = new ModuleDescriptor(Name.special("")); + private ModuleDescriptor root = new ModuleDescriptorImpl(Name.special("")); private KotlinBuiltIns builtIns; private DescriptorResolver descriptorResolver; diff --git a/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java b/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java index d64ed9fb66f..139ff850bfd 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java @@ -24,6 +24,7 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.di.InjectorForTests; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl; import org.jetbrains.jet.lang.psi.JetNamedFunction; import org.jetbrains.jet.lang.psi.JetPsiFactory; import org.jetbrains.jet.lang.resolve.DescriptorResolver; @@ -33,7 +34,7 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; public class JetOverridingTest extends JetLiteFixture { - private ModuleDescriptor root = new ModuleDescriptor(Name.special("")); + private ModuleDescriptor root = new ModuleDescriptorImpl(Name.special("")); private KotlinBuiltIns builtIns; private DescriptorResolver descriptorResolver; diff --git a/generators/org/jetbrains/jet/generators/injectors/GenerateInjectors.java b/generators/org/jetbrains/jet/generators/injectors/GenerateInjectors.java index 134d05a578b..7219e2364bf 100644 --- a/generators/org/jetbrains/jet/generators/injectors/GenerateInjectors.java +++ b/generators/org/jetbrains/jet/generators/injectors/GenerateInjectors.java @@ -17,7 +17,10 @@ package org.jetbrains.jet.generators.injectors; import com.intellij.openapi.project.Project; -import org.jetbrains.jet.codegen.*; +import org.jetbrains.jet.codegen.ClassBuilderFactory; +import org.jetbrains.jet.codegen.ClassBuilderMode; +import org.jetbrains.jet.codegen.ClassFileFactory; +import org.jetbrains.jet.codegen.ScriptCodegen; import org.jetbrains.jet.codegen.intrinsics.IntrinsicMethods; import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.codegen.state.JetTypeMapper; @@ -27,6 +30,7 @@ import org.jetbrains.jet.di.InjectorForTopDownAnalyzer; import org.jetbrains.jet.di.InstantiateType; import org.jetbrains.jet.lang.ModuleConfiguration; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl; import org.jetbrains.jet.lang.psi.JetImportsFactory; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.calls.CallResolver; @@ -138,7 +142,7 @@ public class GenerateInjectors { generator.addPublicParameter(Project.class); generator.addPublicParameter(TopDownAnalysisParameters.class); generator.addPublicParameter(BindingTrace.class); - generator.addParameter(ModuleDescriptor.class); + generator.addParameter(ModuleDescriptorImpl.class); } private static void generateMacroInjector() throws IOException { @@ -181,8 +185,8 @@ public class GenerateInjectors { new GivenExpression("new org.jetbrains.jet.lang.resolve.BindingTraceContext()")); generator.addField(JavaBridgeConfiguration.class); generator.addPublicField(PsiClassFinderImpl.class); - generator.addField(false, ModuleDescriptor.class, null, - new GivenExpression("new org.jetbrains.jet.lang.descriptors.ModuleDescriptor(" + + generator.addField(false, ModuleDescriptorImpl.class, null, + new GivenExpression("new org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl(" + "org.jetbrains.jet.lang.resolve.name.Name.special(\"\"))")); // Parameters diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerProvider.java index 3b73b1a4a6a..c8aeaa16ca5 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerProvider.java @@ -34,10 +34,7 @@ import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.di.InjectorForJavaDescriptorResolver; -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.NamespaceDescriptor; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace; @@ -119,7 +116,7 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider { BindingContext bindingContext = declarationsCache.getBindingContext(); DelegatingBindingTrace delegatingTrace = new DelegatingBindingTrace(bindingContext, "wrapped context of declarations cache"); - return new InjectorForJavaDescriptorResolver(project, delegatingTrace, new ModuleDescriptor(Name.special(""))); + return new InjectorForJavaDescriptorResolver(project, delegatingTrace, new ModuleDescriptorImpl(Name.special(""))); } @Nullable diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java b/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java index 9a4584b2fd2..2c20623931d 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java @@ -47,7 +47,7 @@ import org.jetbrains.jet.codegen.binding.PsiCodegenPredictor; import org.jetbrains.jet.lang.DefaultModuleConfiguration; import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.java.JvmClassName; import org.jetbrains.jet.lang.resolve.java.KotlinToJavaTypesMap; @@ -224,7 +224,7 @@ public class JetSourceNavigationHelper { KotlinCodeAnalyzer analyzer = new ResolveSession( project, storageManager, - new ModuleDescriptor(Name.special("")), + new ModuleDescriptorImpl(Name.special("")), DefaultModuleConfiguration.createStandardConfiguration(), providerFactory); diff --git a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java index cc92e855059..3b4f768d699 100644 --- a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java +++ b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java @@ -224,7 +224,7 @@ public class BuiltInsReferenceResolver extends AbstractProjectComponent { private WritableScope memberScope; private FakeJetNamespaceDescriptor() { - super(new NamespaceDescriptorImpl(new ModuleDescriptor(Name.special("")), + super(new NamespaceDescriptorImpl(new ModuleDescriptorImpl(Name.special("")), Collections.emptyList(), Name.special("")), Collections.emptyList(), KotlinBuiltIns.getInstance().getBuiltInsPackage().getName()); diff --git a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java index 602634ba7e2..9a4e549ef13 100644 --- a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorResolver; 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.descriptors.ModuleDescriptorImpl; import org.jetbrains.jet.lang.ModuleConfiguration; import org.jetbrains.jet.lang.types.DependencyClassByQualifiedNameResolverDummyImpl; import org.jetbrains.jet.lang.resolve.NamespaceFactoryImpl; @@ -60,7 +60,7 @@ public class InjectorForTopDownAnalyzerForJs { private final Project project; private final TopDownAnalysisParameters topDownAnalysisParameters; private final BindingTrace bindingTrace; - private final ModuleDescriptor moduleDescriptor; + private final ModuleDescriptorImpl moduleDescriptor; private final ModuleConfiguration moduleConfiguration; private DependencyClassByQualifiedNameResolverDummyImpl dependencyClassByQualifiedNameResolverDummy; private NamespaceFactoryImpl namespaceFactory; @@ -85,7 +85,7 @@ public class InjectorForTopDownAnalyzerForJs { @NotNull Project project, @NotNull TopDownAnalysisParameters topDownAnalysisParameters, @NotNull BindingTrace bindingTrace, - @NotNull ModuleDescriptor moduleDescriptor, + @NotNull ModuleDescriptorImpl moduleDescriptor, @NotNull ModuleConfiguration moduleConfiguration ) { this.topDownAnalyzer = new TopDownAnalyzer(); 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 182a2094e6f..556f3647717 100644 --- a/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java +++ b/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.analyzer.AnalyzerFacadeForEverything; import org.jetbrains.jet.di.InjectorForTopDownAnalyzerForJs; import org.jetbrains.jet.lang.ModuleConfiguration; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.lazy.declarations.FileBasedDeclarationProviderFactory; @@ -76,7 +76,7 @@ public final class AnalyzerFacadeForJS { boolean storeContextForBodiesResolve) { Project project = config.getProject(); - ModuleDescriptor owner = new ModuleDescriptor(Name.special("")); + ModuleDescriptorImpl owner = new ModuleDescriptorImpl(Name.special("")); Predicate completely = Predicates.and(notLibFiles(config.getLibFiles()), filesToAnalyzeCompletely); @@ -143,7 +143,7 @@ public final class AnalyzerFacadeForJS { LockBasedStorageManager storageManager = new LockBasedStorageManager(); FileBasedDeclarationProviderFactory declarationProviderFactory = new FileBasedDeclarationProviderFactory( storageManager, Config.withJsLibAdded(files, config), Predicates.alwaysFalse()); - ModuleDescriptor lazyModule = new ModuleDescriptor(Name.special("")); + ModuleDescriptorImpl lazyModule = new ModuleDescriptorImpl(Name.special("")); return new ResolveSession(config.getProject(), storageManager, lazyModule, new JsConfiguration(null), declarationProviderFactory); } }