From df115099a690b42201a351563b1264c24364b5c8 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 26 Nov 2014 13:49:00 +0300 Subject: [PATCH] LTDA: Rename method for creating shared trace --- .../jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java | 2 +- .../jet/lang/resolve/java/TopDownAnalyzerFacadeForJVM.java | 2 +- .../org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java | 2 +- .../org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java | 2 +- .../jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 a198d5b1799..78219f4727d 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 @@ -292,7 +292,7 @@ public class KotlinToJVMBytecodeCompiler { @Override public AnalysisResult invoke() { BindingTrace sharedTrace = new CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace(); - ModuleDescriptorImpl analyzeModule = TopDownAnalyzerFacadeForJVM.createAnalyzeModule(); + ModuleDescriptorImpl analyzeModule = TopDownAnalyzerFacadeForJVM.createSealedJavaModule(); return TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( environment.getProject(), diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/TopDownAnalyzerFacadeForJVM.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/TopDownAnalyzerFacadeForJVM.java index cbe1bc5d007..913962e4f98 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/TopDownAnalyzerFacadeForJVM.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/TopDownAnalyzerFacadeForJVM.java @@ -168,7 +168,7 @@ public enum TopDownAnalyzerFacadeForJVM { } @NotNull - public static ModuleDescriptorImpl createAnalyzeModule() { + public static ModuleDescriptorImpl createSealedJavaModule() { ModuleDescriptorImpl module = createJavaModule(""); module.addDependencyOnModule(module); module.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule()); diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java index 0417e7e21d8..d34ac39b215 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java @@ -284,7 +284,7 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest { for (TestModule testModule : groupedByModule.keySet()) { ModuleDescriptorImpl module = testModule == null ? - TopDownAnalyzerFacadeForJVM.createAnalyzeModule() : + TopDownAnalyzerFacadeForJVM.createSealedJavaModule() : createModule(testModule); modules.put(testModule, module); diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index 24cc2e69bcf..a856ae821bf 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -146,7 +146,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { JetCoreEnvironment environment = JetCoreEnvironment.createForTests(getTestRootDisposable(), configuration); BindingTrace trace = new CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace(); - ModuleDescriptorImpl module = TopDownAnalyzerFacadeForJVM.createAnalyzeModule(); + ModuleDescriptorImpl module = TopDownAnalyzerFacadeForJVM.createSealedJavaModule(); TopDownAnalysisParameters parameters = TopDownAnalysisParameters.create( new LockBasedStorageManager(), 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 40038d472b2..4f21301f866 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java @@ -54,7 +54,7 @@ public class LazyResolveTestUtil { Predicates.alwaysTrue(), false, false); BindingTrace trace = new CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace(); - ModuleDescriptorImpl sharedModule = TopDownAnalyzerFacadeForJVM.createAnalyzeModule(); + ModuleDescriptorImpl sharedModule = TopDownAnalyzerFacadeForJVM.createSealedJavaModule(); TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( environment.getProject(),