From 97e0ee4a2900e60caed72000c49d8a7c1329decf Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 3 Jul 2012 21:44:03 +0400 Subject: [PATCH] Got rid of storing CompilerDependencies in JetCoreEnvironment (storing CompilerSpecialMode instead). --- .../compiler/android/CodegenTestsOnAndroidGenerator.java | 2 +- .../jet/cli/jvm/compiler/JetCoreEnvironment.java | 8 ++++---- .../jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java | 8 +++----- .../org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java | 2 +- .../org/jetbrains/jet/checkers/JetDiagnosticsTest.java | 2 +- .../tests/org/jetbrains/jet/codegen/CodegenTestCase.java | 2 +- .../jet/jvm/compiler/ReadJavaBinaryClassTest.java | 2 +- .../jet/jvm/compiler/ReadKotlinBinaryClassTest.java | 2 +- .../org/jetbrains/jet/resolve/DescriptorRendererTest.java | 2 +- .../org/jetbrains/jet/resolve/ExpectedResolveData.java | 2 +- .../tests/org/jetbrains/jet/resolve/JetResolveTest.java | 2 +- .../jet/types/JetDefaultModalityModifiersTest.java | 2 +- .../tests/org/jetbrains/jet/types/JetTypeCheckerTest.java | 2 +- 13 files changed, 18 insertions(+), 20 deletions(-) diff --git a/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java b/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java index af649bd8f8f..d276a0fd717 100644 --- a/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java +++ b/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java @@ -159,7 +159,7 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase { JetFile psiFile = JetPsiFactory.createFile(jetEnvironment.getProject(), text); ClassFileFactory factory; try { - factory = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile, jetEnvironment.getCompilerDependencies().getCompilerSpecialMode()); + factory = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile, jetEnvironment.getCompilerSpecialMode()); } catch (Throwable e) { throw new RuntimeException("Cannot compile: " + filePath + "\n" + text, e); diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java index 0e2595972ca..3e961025801 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java @@ -65,12 +65,12 @@ public class JetCoreEnvironment extends JavaCoreEnvironment { } @NotNull - private final CompilerDependencies compilerDependencies; + private final CompilerSpecialMode compilerSpecialMode; public JetCoreEnvironment(Disposable parentDisposable, @NotNull CompilerDependencies compilerDependencies) { super(parentDisposable); - this.compilerDependencies = compilerDependencies; + this.compilerSpecialMode = compilerDependencies.getCompilerSpecialMode(); registerFileType(JetFileType.INSTANCE, "kt"); registerFileType(JetFileType.INSTANCE, "kts"); @@ -189,8 +189,8 @@ public class JetCoreEnvironment extends JavaCoreEnvironment { } @NotNull - public CompilerDependencies getCompilerDependencies() { - return compilerDependencies; + public CompilerSpecialMode getCompilerSpecialMode() { + return compilerSpecialMode; } public void configure(@NotNull CompilerConfiguration compilerConfiguration) { 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 28a5bd054a5..2fe9f8e17bb 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 @@ -19,7 +19,6 @@ package org.jetbrains.jet.cli.jvm.compiler; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiFile; import com.intellij.testFramework.LightVirtualFile; import com.intellij.util.LocalTimeCounter; @@ -37,7 +36,6 @@ import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation; import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetPsiUtil; -import org.jetbrains.jet.lang.resolve.java.CompilerDependencies; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; @@ -260,7 +258,7 @@ public class KotlinToJVMBytecodeCompiler { @Nullable public static GenerationState analyzeAndGenerate(K2JVMCompileEnvironmentConfiguration configuration) { - return analyzeAndGenerate(configuration, configuration.getEnvironment().getCompilerDependencies().getCompilerSpecialMode().isStubs()); + return analyzeAndGenerate(configuration, configuration.getEnvironment().getCompilerSpecialMode().isStubs()); } @Nullable @@ -299,7 +297,7 @@ public class KotlinToJVMBytecodeCompiler { environment.getSourceFiles(), scriptParameters, filesToAnalyzeCompletely, - configuration.getEnvironment().getCompilerDependencies().getCompilerSpecialMode()); + configuration.getEnvironment().getCompilerSpecialMode()); } }, environment.getSourceFiles() ); @@ -322,7 +320,7 @@ public class KotlinToJVMBytecodeCompiler { }; GenerationState generationState = new GenerationState(project, ClassBuilderFactories.binaries(stubs), backendProgress, exhaust, environment.getSourceFiles(), - configuration.getEnvironment().getCompilerDependencies().getCompilerSpecialMode()); + configuration.getEnvironment().getCompilerSpecialMode()); generationState.compileCorrectFiles(CompilationErrorHandler.THROW_EXCEPTION); List plugins = configuration.getCompilerPlugins(); 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 8480bbd3454..a67cbbb8736 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 @@ -247,7 +247,7 @@ public class ReplInterpreter { GenerationState generationState = new GenerationState(jetCoreEnvironment.getProject(), ClassBuilderFactories.binaries(false), backendProgress, AnalyzeExhaust.success(trace.getBindingContext()), Collections.singletonList(psiFile), - jetCoreEnvironment.getCompilerDependencies().getCompilerSpecialMode()); + jetCoreEnvironment.getCompilerSpecialMode()); generationState.compileScript(psiFile.getScript(), scriptClassName, earierScripts, CompilationErrorHandler.THROW_EXCEPTION); for (String file : generationState.getFactory().files()) { diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java index b7228d18f16..94fe666a2c6 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java @@ -176,7 +176,7 @@ public class JetDiagnosticsTest extends JetLiteFixture { BindingContext bindingContext = AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( getProject(), jetFiles, Collections.emptyList(), Predicates.alwaysTrue(), - myEnvironment.getCompilerDependencies().getCompilerSpecialMode()) + myEnvironment.getCompilerSpecialMode()) .getBindingContext(); boolean ok = true; diff --git a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java index f7927633b07..f26b77d6af4 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java +++ b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java @@ -259,7 +259,7 @@ public abstract class CodegenTestCase extends UsefulTestCase { myFiles.getPsiFiles(), myFiles.getScriptParameterTypes(), Predicates.alwaysTrue(), - myEnvironment.getCompilerDependencies().getCompilerSpecialMode()); + myEnvironment.getCompilerSpecialMode()); analyzeExhaust.throwIfError(); AnalyzingUtils.throwExceptionOnErrors(analyzeExhaust.getBindingContext()); GenerationState state = new GenerationState(myEnvironment.getProject(), classBuilderFactory, analyzeExhaust, myFiles.getPsiFiles()); diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTest.java index 90c5e6fda7c..da3907eefea 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTest.java @@ -90,7 +90,7 @@ public class ReadJavaBinaryClassTest extends TestCaseWithTmpdir { BindingContext bindingContext = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegrationAndCheckForErrors( psiFile, Collections.emptyList(), - jetCoreEnvironment.getCompilerDependencies().getCompilerSpecialMode()) + jetCoreEnvironment.getCompilerSpecialMode()) .getBindingContext(); return bindingContext.get(BindingContext.FQNAME_TO_NAMESPACE_DESCRIPTOR, FqName.topLevel(Name.identifier("test"))); } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadKotlinBinaryClassTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadKotlinBinaryClassTest.java index 05998b48c29..ea263afcfa9 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadKotlinBinaryClassTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadKotlinBinaryClassTest.java @@ -93,7 +93,7 @@ public class ReadKotlinBinaryClassTest extends TestCaseWithTmpdir { jetCoreEnvironment.addToClasspath(new File("out/production/runtime")); InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices( - jetCoreEnvironment.getCompilerDependencies().getCompilerSpecialMode(), jetCoreEnvironment.getProject()); + jetCoreEnvironment.getCompilerSpecialMode(), jetCoreEnvironment.getProject()); JavaDescriptorResolver javaDescriptorResolver = injector.getJavaDescriptorResolver(); NamespaceDescriptor namespaceFromClass = javaDescriptorResolver.resolveNamespace(FqName.topLevel(Name.identifier("test")), DescriptorSearchRule.ERROR_IF_FOUND_IN_KOTLIN); diff --git a/compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java b/compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java index 737076f1faa..4168094849e 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java +++ b/compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java @@ -92,7 +92,7 @@ public class DescriptorRendererTest extends JetLiteFixture { AnalyzeExhaust analyzeExhaust = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration( (JetFile) psiFile, Collections.emptyList(), - myEnvironment.getCompilerDependencies().getCompilerSpecialMode()); + myEnvironment.getCompilerSpecialMode()); final BindingContext bindingContext = analyzeExhaust.getBindingContext(); final List descriptors = new ArrayList(); psiFile.acceptChildren(new JetVisitorVoid() { diff --git a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java index 99caf8a2188..037798a884a 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java +++ b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java @@ -156,7 +156,7 @@ public abstract class ExpectedResolveData { AnalyzeExhaust analyzeExhaust = AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(project, files, Collections.emptyList(), Predicates.alwaysTrue(), - jetCoreEnvironment.getCompilerDependencies().getCompilerSpecialMode()); + jetCoreEnvironment.getCompilerSpecialMode()); BindingContext bindingContext = analyzeExhaust.getBindingContext(); for (Diagnostic diagnostic : bindingContext.getDiagnostics()) { if (diagnostic.getFactory() instanceof UnresolvedReferenceDiagnosticFactory) { diff --git a/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java b/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java index c3825df0409..980e326ba43 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java +++ b/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java @@ -125,7 +125,7 @@ public class JetResolveTest extends ExtensibleResolveTestCase { private PsiClass findClass(String qualifiedName) { Project project = getProject(); InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices( - myEnvironment.getCompilerDependencies().getCompilerSpecialMode(), project); + myEnvironment.getCompilerSpecialMode(), project); return injector.getPsiClassFinder().findPsiClass(new FqName(qualifiedName), PsiClassFinder.RuntimeClassesHandleMode.THROW); } diff --git a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java index f9ad5edc8ba..e3d1297e14e 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java @@ -68,7 +68,7 @@ public class JetDefaultModalityModifiersTest extends JetLiteFixture { assert aClass instanceof JetClass; AnalyzeExhaust bindingContext = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration(file, Collections.emptyList(), - myEnvironment.getCompilerDependencies().getCompilerSpecialMode()); + myEnvironment.getCompilerSpecialMode()); DeclarationDescriptor classDescriptor = bindingContext.getBindingContext().get(BindingContext.DECLARATION_TO_DESCRIPTOR, aClass); WritableScopeImpl scope = new WritableScopeImpl( libraryScope, root, RedeclarationHandler.DO_NOTHING, "JetDefaultModalityModifiersTest"); diff --git a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java index 959028adecc..5690576ae2b 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java @@ -594,7 +594,7 @@ public class JetTypeCheckerTest extends JetLiteFixture { scope, scope.getContainingDeclaration(), RedeclarationHandler.DO_NOTHING, "JetTypeCheckerTest.addImports"); writableScope.importScope(library.getLibraryScope()); InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices( - myEnvironment.getCompilerDependencies().getCompilerSpecialMode(), getProject()); + myEnvironment.getCompilerSpecialMode(), getProject()); JavaDescriptorResolver javaDescriptorResolver = injector.getJavaDescriptorResolver(); writableScope.importScope(javaDescriptorResolver.resolveNamespace(FqName.ROOT, DescriptorSearchRule.INCLUDE_KOTLIN).getMemberScope());