From 7a1d5d63dc14ef1bc10c82744c7250caa0102956 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 22 Aug 2014 23:06:16 +0400 Subject: [PATCH] Rename: AnalyzerFacadeForJvm(Js) -> TopDownAnalyzerFacadeForJvm(Js) --- .../cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java | 4 ++-- .../cli/jvm/compiler/CliLightClassGenerationSupport.java | 4 ++-- .../cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java | 4 ++-- .../org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java | 4 ++-- .../jet/di/InjectorForJavaDescriptorResolver.java | 3 ++- .../jetbrains/jet/lang/resolve/java/JvmAnalyzerFacade.kt | 2 +- ...acadeForJVM.java => TopDownAnalyzerFacadeForJVM.java} | 4 ++-- compiler/tests/org/jetbrains/jet/JetTestUtils.java | 4 ++-- .../jet/checkers/AbstractJetDiagnosticsTest.java | 6 +++--- .../lazy/AbstractLazyResolveDescriptorRendererTest.java | 4 ++-- .../jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java | 8 ++++---- .../jet/plugin/caches/resolve/JsAnalyzerFacade.kt | 4 ++-- .../jet/plugin/libraries/JetSourceNavigationHelper.java | 4 ++-- .../jet/plugin/quickfix/ImportInsertHelper.java | 9 ++++----- .../plugin/libraries/DecompiledTextConsistencyTest.kt | 6 +++--- ...rFacadeForJS.java => TopDownAnalyzerFacadeForJS.java} | 4 ++-- .../org/jetbrains/k2js/test/utils/TranslationUtils.java | 6 +++--- .../src/org/jetbrains/k2js/facade/K2JSTranslator.java | 6 +++--- .../src/test/kotlin/NoInternalVisibilityInStdLibTest.kt | 6 +++--- 19 files changed, 46 insertions(+), 46 deletions(-) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/{AnalyzerFacadeForJVM.java => TopDownAnalyzerFacadeForJVM.java} (98%) rename js/js.frontend/src/org/jetbrains/k2js/analyze/{AnalyzerFacadeForJS.java => TopDownAnalyzerFacadeForJS.java} (98%) diff --git a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java index 7e035b3c5b4..466a85b7a14 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java @@ -44,7 +44,7 @@ import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.config.Services; import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.k2js.analyze.AnalyzerFacadeForJS; +import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS; import org.jetbrains.k2js.config.*; import org.jetbrains.k2js.facade.K2JSTranslator; import org.jetbrains.k2js.facade.MainCallParameters; @@ -179,7 +179,7 @@ public class K2JSCompiler extends CLICompiler { analyzerWithCompilerReport.analyzeAndReport(sources, new Function0() { @Override public AnalyzeExhaust invoke() { - return AnalyzerFacadeForJS.analyzeFiles(sources, Predicates.alwaysTrue(), config); + return TopDownAnalyzerFacadeForJS.analyzeFiles(sources, Predicates.alwaysTrue(), config); } }); return analyzerWithCompilerReport.hasErrors(); diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliLightClassGenerationSupport.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliLightClassGenerationSupport.java index 41e018ee306..3b8e0daee16 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliLightClassGenerationSupport.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliLightClassGenerationSupport.java @@ -39,7 +39,7 @@ import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.*; -import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; +import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; @@ -82,7 +82,7 @@ public class CliLightClassGenerationSupport extends LightClassGenerationSupport @NotNull public ModuleDescriptorImpl newModule() { assert this.module == null : "module already configured: " + module; - module = AnalyzerFacadeForJVM.createJavaModule(""); + module = TopDownAnalyzerFacadeForJVM.createJavaModule(""); module.addDependencyOnModule(module); module.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule()); module.seal(); diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java index d74f0757276..52d9a8c177e 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java @@ -51,7 +51,7 @@ import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.ScriptNameUtil; -import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; +import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalPackage; import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache; @@ -291,7 +291,7 @@ public class KotlinToJVMBytecodeCompiler { BindingTrace sharedTrace = support.getTrace(); ModuleDescriptorImpl sharedModule = support.newModule(); - return AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( + return TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( environment.getProject(), environment.getSourceFiles(), sharedTrace, 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 8fe6c8df6db..160ff70ac2b 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 @@ -49,7 +49,7 @@ import org.jetbrains.jet.lang.parsing.JetParserDefinition; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetScript; import org.jetbrains.jet.lang.resolve.*; -import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; +import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.java.JvmClassName; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; @@ -98,7 +98,7 @@ public class ReplInterpreter { Project project = environment.getProject(); this.psiFileFactory = (PsiFileFactoryImpl) PsiFileFactory.getInstance(project); this.trace = new BindingTraceContext(); - this.module = AnalyzerFacadeForJVM.createJavaModule(""); + this.module = TopDownAnalyzerFacadeForJVM.createJavaModule(""); TopDownAnalysisParameters topDownAnalysisParameters = TopDownAnalysisParameters.createForLocalDeclarations( new LockBasedStorageManager(), new ExceptionTracker(), // dummy 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 c97741375da..8ef63ee78f0 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java @@ -19,6 +19,7 @@ package org.jetbrains.jet.di; import com.intellij.openapi.project.Project; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.context.GlobalContextImpl; +import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; import org.jetbrains.jet.storage.LockBasedStorageManager; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; @@ -82,7 +83,7 @@ public class InjectorForJavaDescriptorResolver { this.bindingTrace = bindingTrace; this.globalContext = org.jetbrains.jet.context.ContextPackage.GlobalContext(); this.lockBasedStorageManager = globalContext.getStorageManager(); - this.module = org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM.createJavaModule(""); + this.module = TopDownAnalyzerFacadeForJVM.createJavaModule(""); this.javaClassFinder = new JavaClassFinderImpl(); this.virtualFileFinder = org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder.SERVICE.getInstance(project); this.deserializedDescriptorResolver = new DeserializedDescriptorResolver(); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmAnalyzerFacade.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmAnalyzerFacade.kt index f918aa89018..5eab9dc3015 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmAnalyzerFacade.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmAnalyzerFacade.kt @@ -73,7 +73,7 @@ public object JvmAnalyzerFacade : AnalyzerFacade"); + ModuleDescriptorImpl module = TopDownAnalyzerFacadeForJVM.createJavaModule("<" + testModule.getName() + ">"); modules.put(testModule, module); } 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 fd0fbdae297..470a26873e1 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java @@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingTraceContext; -import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; +import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.lazy.declarations.FileBasedDeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; @@ -62,7 +62,7 @@ public abstract class AbstractLazyResolveDescriptorRendererTest extends KotlinTe JetFile psiFile = JetPsiFactory(getProject()).createFile(fileText); Collection files = Lists.newArrayList(psiFile); - final ModuleDescriptorImpl lazyModule = AnalyzerFacadeForJVM.createJavaModule(""); + final ModuleDescriptorImpl lazyModule = TopDownAnalyzerFacadeForJVM.createJavaModule(""); lazyModule.addDependencyOnModule(lazyModule); lazyModule.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule()); lazyModule.seal(); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java index 7ec9d07b063..6422ea1b3c2 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.BindingTraceContext; -import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; +import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import java.util.Collection; @@ -76,7 +76,7 @@ public class JvmResolveUtil { ) { BindingTraceContext bindingTraceContext = new BindingTraceContext(); - ModuleDescriptorImpl module = AnalyzerFacadeForJVM.createJavaModule(""); + ModuleDescriptorImpl module = TopDownAnalyzerFacadeForJVM.createJavaModule(""); module.addDependencyOnModule(module); module.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule()); module.seal(); @@ -84,7 +84,7 @@ public class JvmResolveUtil { if (lightClassGenerationSupport != null) { lightClassGenerationSupport.setModule(module); } - return AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(project, files, bindingTraceContext, filesToAnalyzeCompletely, - module, null, null); + return TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(project, files, bindingTraceContext, filesToAnalyzeCompletely, + module, null, null); } } diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JsAnalyzerFacade.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JsAnalyzerFacade.kt index 0e68ad38575..f774e27fe87 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JsAnalyzerFacade.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JsAnalyzerFacade.kt @@ -25,7 +25,7 @@ import org.jetbrains.jet.analyzer.AnalyzerFacade import com.intellij.openapi.project.Project import org.jetbrains.jet.context.GlobalContext import org.jetbrains.jet.analyzer.ResolverForProject -import org.jetbrains.k2js.analyze.AnalyzerFacadeForJS +import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS import org.jetbrains.jet.lang.PlatformToKotlinClassMap import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactoryService import org.jetbrains.jet.lang.resolve.BindingTraceContext @@ -60,7 +60,7 @@ public object JsAnalyzerFacade : AnalyzerFacade"), - AnalyzerFacadeForJVM.DEFAULT_IMPORTS, + TopDownAnalyzerFacadeForJVM.DEFAULT_IMPORTS, PlatformToKotlinClassMap.EMPTY); moduleDescriptor.addDependencyOnModule(moduleDescriptor); diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java index 65b4f595cf8..e02a3dd7ab8 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java @@ -24,13 +24,12 @@ import com.intellij.psi.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.ImportPath; -import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; -import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; +import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.NamePackage; import org.jetbrains.jet.plugin.project.ProjectStructureUtil; import org.jetbrains.jet.plugin.references.JetReference; -import org.jetbrains.k2js.analyze.AnalyzerFacadeForJS; +import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS; import java.util.List; @@ -166,8 +165,8 @@ public class ImportInsertHelper { public static boolean isImportedWithDefault(@NotNull ImportPath importPath, @NotNull JetFile contextFile) { List defaultImports = ProjectStructureUtil.isJsKotlinModule(contextFile) - ? AnalyzerFacadeForJS.DEFAULT_IMPORTS - : AnalyzerFacadeForJVM.DEFAULT_IMPORTS; + ? TopDownAnalyzerFacadeForJS.DEFAULT_IMPORTS + : TopDownAnalyzerFacadeForJVM.DEFAULT_IMPORTS; return NamePackage.isImported(importPath, defaultImports); } diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextConsistencyTest.kt b/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextConsistencyTest.kt index 85c5935cc58..72a783aec66 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextConsistencyTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextConsistencyTest.kt @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.lang.resolve.resolveTopLevelClass import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor import org.jetbrains.jet.lang.descriptors.ModuleDescriptor -import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM +import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM import org.jetbrains.jet.lang.resolve.BindingTraceContext public class DecompiledTextConsistencyTest : JetLightCodeInsightFixtureTestCase() { @@ -57,11 +57,11 @@ public class DecompiledTextConsistencyTest : JetLightCodeInsightFixtureTestCase( class ProjectBasedResolverForDecompiler(project: Project) : ResolverForDecompiler { val module: ModuleDescriptor = run { - val module = AnalyzerFacadeForJVM.createJavaModule("") + val module = TopDownAnalyzerFacadeForJVM.createJavaModule("") module.addDependencyOnModule(module) module.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule()) module.seal() - AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( + TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( project, listOf(), BindingTraceContext(), { false }, module, null, null ).getModuleDescriptor() diff --git a/js/js.frontend/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java b/js/js.frontend/src/org/jetbrains/k2js/analyze/TopDownAnalyzerFacadeForJS.java similarity index 98% rename from js/js.frontend/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java rename to js/js.frontend/src/org/jetbrains/k2js/analyze/TopDownAnalyzerFacadeForJS.java index 51a1aefcc9c..ed8fdbd5c92 100644 --- a/js/js.frontend/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java +++ b/js/js.frontend/src/org/jetbrains/k2js/analyze/TopDownAnalyzerFacadeForJS.java @@ -39,14 +39,14 @@ import org.jetbrains.k2js.config.Config; import java.util.Collection; import java.util.List; -public final class AnalyzerFacadeForJS { +public final class TopDownAnalyzerFacadeForJS { public static final List DEFAULT_IMPORTS = ImmutableList.of( new ImportPath("js.*"), new ImportPath("java.lang.*"), new ImportPath("kotlin.*") ); - private AnalyzerFacadeForJS() { + private TopDownAnalyzerFacadeForJS() { } //NOTE: web demo related method diff --git a/js/js.tests/test/org/jetbrains/k2js/test/utils/TranslationUtils.java b/js/js.tests/test/org/jetbrains/k2js/test/utils/TranslationUtils.java index 57dbd21efbc..b43b2596b3e 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/utils/TranslationUtils.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/utils/TranslationUtils.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.OutputFileCollection; import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage; import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.k2js.analyze.AnalyzerFacadeForJS; +import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS; import org.jetbrains.k2js.config.Config; import org.jetbrains.k2js.config.EcmaVersion; import org.jetbrains.k2js.facade.MainCallParameters; @@ -76,8 +76,8 @@ public final class TranslationUtils { return isFileWithCode((JetFile) file); } }; - AnalyzeExhaust exhaust = AnalyzerFacadeForJS.analyzeFiles(allLibFiles, filesWithCode, Config.getEmptyConfig(project)); - AnalyzerFacadeForJS.checkForErrors(allLibFiles, exhaust.getBindingContext()); + AnalyzeExhaust exhaust = TopDownAnalyzerFacadeForJS.analyzeFiles(allLibFiles, filesWithCode, Config.getEmptyConfig(project)); + TopDownAnalyzerFacadeForJS.checkForErrors(allLibFiles, exhaust.getBindingContext()); cachedLibraryExhaust = new SoftReference(exhaust); return exhaust; } diff --git a/js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java b/js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java index a4584a55b3d..494c8ccfae5 100644 --- a/js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java @@ -40,7 +40,7 @@ import org.jetbrains.jet.utils.fileUtils.FileUtilsPackage; import org.jetbrains.js.compiler.JsSourceGenerationVisitor; import org.jetbrains.js.compiler.sourcemap.SourceMap3Builder; import org.jetbrains.js.compiler.sourcemap.SourceMapBuilder; -import org.jetbrains.k2js.analyze.AnalyzerFacadeForJS; +import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS; import org.jetbrains.k2js.config.Config; import org.jetbrains.k2js.facade.exceptions.TranslationException; import org.jetbrains.k2js.translate.general.Translation; @@ -145,9 +145,9 @@ public final class K2JSTranslator { public JsProgram generateProgram(@NotNull List filesToTranslate, @NotNull MainCallParameters mainCallParameters) throws TranslationException { - AnalyzeExhaust analyzeExhaust = AnalyzerFacadeForJS.analyzeFiles(filesToTranslate, Predicates.alwaysTrue(), config); + AnalyzeExhaust analyzeExhaust = TopDownAnalyzerFacadeForJS.analyzeFiles(filesToTranslate, Predicates.alwaysTrue(), config); BindingContext bindingContext = analyzeExhaust.getBindingContext(); - AnalyzerFacadeForJS.checkForErrors(Config.withJsLibAdded(filesToTranslate, config), bindingContext); + TopDownAnalyzerFacadeForJS.checkForErrors(Config.withJsLibAdded(filesToTranslate, config), bindingContext); ModuleDescriptor moduleDescriptor = analyzeExhaust.getModuleDescriptor(); return Translation.generateAst(bindingContext, filesToTranslate, mainCallParameters, moduleDescriptor, config); } diff --git a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt index 7c0118aecec..17bf7ee7dab 100644 --- a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt +++ b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt @@ -19,7 +19,7 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment import com.intellij.openapi.util.Disposer import org.jetbrains.jet.config.CompilerConfiguration import org.jetbrains.jet.config.CommonConfigurationKeys -import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM +import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM import org.jetbrains.jet.lang.resolve.BindingTraceContext import org.jetbrains.jet.lang.resolve.name.Name import org.jetbrains.jet.lang.resolve.name.FqName @@ -103,10 +103,10 @@ class NoInternalVisibilityInStdLibTest { configuration.add(CommonConfigurationKeys.SOURCE_ROOTS_KEY, "../src/kotlin") configuration.addAll(JVMConfigurationKeys.CLASSPATH_KEY, PathUtil.getJdkClassesRoots()) val environment = JetCoreEnvironment.createForProduction(disposable, configuration) - val module = AnalyzerFacadeForJVM.createJavaModule("") + val module = TopDownAnalyzerFacadeForJVM.createJavaModule("") module.addDependencyOnModule(module) module.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule()) - AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( + TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( environment.getProject(), environment.getSourceFiles(), BindingTraceContext(),