From 5a88d28154fac3782e8733698eb9ebb6a2855b86 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 3 Jul 2012 19:08:41 +0400 Subject: [PATCH] Got rid of dependency on compiler dependencies in injector for TDA for JVM. --- .../compiler/KotlinToJVMBytecodeCompiler.java | 2 +- .../jet/cli/jvm/repl/ReplInterpreter.java | 3 +- .../di/InjectorForTopDownAnalyzerForJvm.java | 11 +++---- .../resolve/java/AnalyzerFacadeForJVM.java | 33 ++++++++----------- .../jetbrains/jet/asJava/JetLightClass.java | 2 +- .../tests/org/jetbrains/jet/JetTestUtils.java | 4 +-- .../jet/checkers/CheckerTestUtilTest.java | 6 ++-- .../jet/checkers/JetDiagnosticsTest.java | 2 +- .../jet/codegen/CodegenTestCase.java | 2 +- .../jet/codegen/GenerationUtils.java | 4 +-- .../jvm/compiler/ReadJavaBinaryClassTest.java | 2 +- .../resolve/lazy/AbstractLazyResolveTest.java | 2 +- .../jet/resolve/DescriptorRendererTest.java | 4 +-- .../jet/resolve/ExpectedResolveData.java | 2 +- .../JetDefaultModalityModifiersTest.java | 2 +- .../jet/di/AllInjectorsGenerator.java | 3 +- 16 files changed, 34 insertions(+), 50 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 5b5d0e34633..b924597f306 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 @@ -302,7 +302,7 @@ public class KotlinToJVMBytecodeCompiler { environment.getSourceFiles(), scriptParameters, filesToAnalyzeCompletely, - configuration.getEnvironment().getCompilerDependencies()); + configuration.getEnvironment().getCompilerDependencies().getCompilerSpecialMode()); } }, environment.getSourceFiles() ); 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 1d6afd99abc..8480bbd3454 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 @@ -105,7 +105,8 @@ public class ReplInterpreter { false, true, Collections.emptyList()); - injector = new InjectorForTopDownAnalyzerForJvm(project, topDownAnalysisParameters, trace, module, compilerDependencies); + injector = new InjectorForTopDownAnalyzerForJvm(project, topDownAnalysisParameters, trace, module, + compilerDependencies.getCompilerSpecialMode()); List classpath = Lists.newArrayList(); 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 73c3634184f..892e4938483 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.ModuleDescriptor; -import org.jetbrains.jet.lang.resolve.java.CompilerDependencies; import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode; import org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; @@ -54,7 +53,7 @@ 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.resolve.java.CompilerDependencies; +import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; @@ -71,8 +70,7 @@ public class InjectorForTopDownAnalyzerForJvm { private final TopDownAnalysisParameters topDownAnalysisParameters; private final BindingTrace bindingTrace; private final ModuleDescriptor moduleDescriptor; - private final CompilerDependencies compilerDependencies; - private CompilerSpecialMode compilerSpecialMode; + private final CompilerSpecialMode compilerSpecialMode; private JavaBridgeConfiguration javaBridgeConfiguration; private JavaDescriptorResolver javaDescriptorResolver; private PsiClassFinderImpl psiClassFinder; @@ -100,7 +98,7 @@ public class InjectorForTopDownAnalyzerForJvm { @NotNull TopDownAnalysisParameters topDownAnalysisParameters, @NotNull BindingTrace bindingTrace, @NotNull ModuleDescriptor moduleDescriptor, - @NotNull CompilerDependencies compilerDependencies + @NotNull CompilerSpecialMode compilerSpecialMode ) { this.topDownAnalyzer = new TopDownAnalyzer(); this.topDownAnalysisContext = new TopDownAnalysisContext(); @@ -112,8 +110,7 @@ public class InjectorForTopDownAnalyzerForJvm { this.topDownAnalysisParameters = topDownAnalysisParameters; this.bindingTrace = bindingTrace; this.moduleDescriptor = moduleDescriptor; - this.compilerDependencies = compilerDependencies; - this.compilerSpecialMode = compilerDependencies.getCompilerSpecialMode(); + this.compilerSpecialMode = compilerSpecialMode; this.javaBridgeConfiguration = new JavaBridgeConfiguration(); this.javaDescriptorResolver = new JavaDescriptorResolver(); this.psiClassFinder = new PsiClassFinderImpl(); 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 16e6a507930..5adb460e7e1 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 @@ -28,19 +28,12 @@ import org.jetbrains.jet.di.InjectorForTopDownAnalyzerForJvm; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.*; -import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; -import org.jetbrains.jet.lang.resolve.AnalyzingUtils; -import org.jetbrains.jet.lang.resolve.BindingTraceContext; -import org.jetbrains.jet.lang.resolve.ObservableBindingTrace; -import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; import org.jetbrains.jet.lang.resolve.name.Name; import java.util.Collection; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.lang.resolve.java.CompilerDependencies.compilerDependenciesForProduction; - /** * @author abreslav */ @@ -58,7 +51,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { @NotNull List scriptParameters, @NotNull Predicate filesToAnalyzeCompletely) { return analyzeFilesWithJavaIntegration(project, files, scriptParameters, filesToAnalyzeCompletely, - compilerDependenciesForProduction(CompilerSpecialMode.REGULAR), true); + CompilerSpecialMode.REGULAR, true); } @NotNull @@ -75,10 +68,10 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { } public static AnalyzeExhaust analyzeOneFileWithJavaIntegrationAndCheckForErrors( - JetFile file, List scriptParameters, @NotNull CompilerDependencies compilerDependencies) { + JetFile file, List scriptParameters, @NotNull CompilerSpecialMode compilerSpecialMode) { AnalyzingUtils.checkForSyntacticErrors(file); - AnalyzeExhaust analyzeExhaust = analyzeOneFileWithJavaIntegration(file, scriptParameters, compilerDependencies); + AnalyzeExhaust analyzeExhaust = analyzeOneFileWithJavaIntegration(file, scriptParameters, compilerSpecialMode); AnalyzingUtils.throwExceptionOnErrors(analyzeExhaust.getBindingContext()); @@ -86,20 +79,20 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { } public static AnalyzeExhaust analyzeOneFileWithJavaIntegration( - JetFile file, List scriptParameters, @NotNull CompilerDependencies compilerDependencies) { + JetFile file, List scriptParameters, @NotNull CompilerSpecialMode compilerSpecialMode) { return analyzeFilesWithJavaIntegration(file.getProject(), Collections.singleton(file), scriptParameters, - Predicates.alwaysTrue(), compilerDependencies); + Predicates.alwaysTrue(), compilerSpecialMode); } public static AnalyzeExhaust analyzeFilesWithJavaIntegrationAndCheckForErrors( Project project, Collection files, List scriptParameters, Predicate filesToAnalyzeCompletely, - @NotNull CompilerDependencies compilerDependencies) { + @NotNull CompilerSpecialMode compilerSpecialMode) { for (JetFile file : files) { AnalyzingUtils.checkForSyntacticErrors(file); } AnalyzeExhaust analyzeExhaust = analyzeFilesWithJavaIntegration( - project, files, scriptParameters, filesToAnalyzeCompletely, compilerDependencies, false); + project, files, scriptParameters, filesToAnalyzeCompletely, compilerSpecialMode, false); AnalyzingUtils.throwExceptionOnErrors(analyzeExhaust.getBindingContext()); @@ -108,14 +101,14 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { public static AnalyzeExhaust analyzeFilesWithJavaIntegration( Project project, Collection files, List scriptParameters, Predicate filesToAnalyzeCompletely, - @NotNull CompilerDependencies compilerDependencies) { + @NotNull CompilerSpecialMode compilerSpecialMode) { return analyzeFilesWithJavaIntegration( - project, files, scriptParameters, filesToAnalyzeCompletely, compilerDependencies, false); + project, files, scriptParameters, filesToAnalyzeCompletely, compilerSpecialMode, false); } public static AnalyzeExhaust analyzeFilesWithJavaIntegration( Project project, Collection files, List scriptParameters, Predicate filesToAnalyzeCompletely, - @NotNull CompilerDependencies compilerDependencies, + @NotNull CompilerSpecialMode compilerSpecialMode, boolean storeContextForBodiesResolve) { BindingTraceContext bindingTraceContext = new BindingTraceContext(); @@ -126,7 +119,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { InjectorForTopDownAnalyzerForJvm injector = new InjectorForTopDownAnalyzerForJvm( project, topDownAnalysisParameters, - new ObservableBindingTrace(bindingTraceContext), owner, compilerDependencies); + new ObservableBindingTrace(bindingTraceContext), owner, compilerSpecialMode); try { injector.getTopDownAnalyzer().analyzeFiles(files, scriptParameters); BodiesResolveContext bodiesResolveContext = storeContextForBodiesResolve ? @@ -139,13 +132,13 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { } public static AnalyzeExhaust shallowAnalyzeFiles(Collection files, - @NotNull CompilerSpecialMode compilerSpecialMode, @NotNull CompilerDependencies compilerDependencies) { + @NotNull CompilerSpecialMode compilerSpecialMode) { assert files.size() > 0; Project project = files.iterator().next().getProject(); return analyzeFilesWithJavaIntegration(project, files, Collections.emptyList(), Predicates.alwaysFalse(), - compilerDependencies); + compilerSpecialMode); } } diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java index a3cb6b8ea7a..b1d6c79d7f3 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java @@ -171,7 +171,7 @@ public class JetLightClass extends AbstractLightClass implements JetJavaMirrorMa AnalyzeExhaust context = AnalyzerFacadeForJVM.shallowAnalyzeFiles( JetFilesProvider.getInstance(project).sampleToAllFilesInModule().fun(file), // TODO: wrong environment // stepan.koltsov@ 2012-04-09 - CompilerSpecialMode.REGULAR, CompilerDependencies.compilerDependenciesForProduction(CompilerSpecialMode.REGULAR)); + CompilerSpecialMode.REGULAR); if (context.isError()) { throw new IllegalStateException("failed to analyze: " + context.getError(), context.getError()); diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index 75c4c2f0243..36a532aa712 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java @@ -33,9 +33,9 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.jet.lang.diagnostics.UnresolvedReferenceDiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Severity; +import org.jetbrains.jet.lang.diagnostics.UnresolvedReferenceDiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; @@ -172,7 +172,7 @@ public class JetTestUtils { public static AnalyzeExhaust analyzeFile(@NotNull JetFile namespace, @NotNull CompilerSpecialMode compilerSpecialMode) { return AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration(namespace, Collections.emptyList(), - CompileCompilerDependenciesTest.compilerDependenciesForTests(compilerSpecialMode, true)); + compilerSpecialMode); } public static JetCoreEnvironment createEnvironmentWithMockJdkAndIdeaAnnotations(Disposable disposable) { diff --git a/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java b/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java index 355fca9459e..0764d0a3279 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java @@ -19,7 +19,6 @@ package org.jetbrains.jet.checkers; import com.google.common.collect.Lists; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.CompileCompilerDependenciesTest; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.psi.JetFile; @@ -107,9 +106,8 @@ public class CheckerTestUtilTest extends JetLiteFixture { public void test(final @NotNull PsiFile psiFile) { BindingContext bindingContext = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration( - (JetFile) psiFile, Collections.emptyList(), - CompileCompilerDependenciesTest.compilerDependenciesForTests(CompilerSpecialMode.REGULAR, true)) - .getBindingContext(); + (JetFile) psiFile,Collections.emptyList(), CompilerSpecialMode.REGULAR) + .getBindingContext(); String expectedText = CheckerTestUtil.addDiagnosticMarkersToText(psiFile, CheckerTestUtil.getDiagnosticsIncludingSyntaxErrors(bindingContext, psiFile)).toString(); diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java index 1cec33fa494..b7228d18f16 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()) + myEnvironment.getCompilerDependencies().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 3fe994ec47e..f7927633b07 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()); + myEnvironment.getCompilerDependencies().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/codegen/GenerationUtils.java b/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java index 3ccce7ee0d6..f570c4b770e 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java +++ b/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java @@ -17,7 +17,6 @@ package org.jetbrains.jet.codegen; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.CompileCompilerDependenciesTest; import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; @@ -37,8 +36,7 @@ public class GenerationUtils { public static GenerationState compileFileGetGenerationStateForTest(JetFile psiFile, @NotNull CompilerSpecialMode compilerSpecialMode) { final AnalyzeExhaust analyzeExhaust = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegrationAndCheckForErrors( - psiFile, Collections.emptyList(), - CompileCompilerDependenciesTest.compilerDependenciesForTests(compilerSpecialMode, true)); + psiFile, Collections.emptyList(), compilerSpecialMode); analyzeExhaust.throwIfError(); GenerationState state = new GenerationState(psiFile.getProject(), ClassBuilderFactories.binaries(false), analyzeExhaust, Collections.singletonList(psiFile)); state.compileCorrectFiles(CompilationErrorHandler.THROW_EXCEPTION); diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTest.java index 087e473a02e..1e657daeca6 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()) + jetCoreEnvironment.getCompilerDependencies().getCompilerSpecialMode()) .getBindingContext(); return bindingContext.get(BindingContext.FQNAME_TO_NAMESPACE_DESCRIPTOR, FqName.topLevel(Name.identifier("test"))); } diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java index eba90eb7c73..b4999530d1d 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java @@ -75,7 +75,7 @@ public abstract class AbstractLazyResolveTest { protected InjectorForTopDownAnalyzerForJvm createInjectorForTDA(ModuleDescriptor module) { TopDownAnalysisParameters params = new TopDownAnalysisParameters( Predicates.alwaysTrue(), false, false, Collections.emptyList()); - return new InjectorForTopDownAnalyzerForJvm(project, params, new BindingTraceContext(), module, compilerDependencies); + return new InjectorForTopDownAnalyzerForJvm(project, params, new BindingTraceContext(), module, CompilerSpecialMode.JDK_HEADERS); } } diff --git a/compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java b/compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java index f0ed40be001..737076f1faa 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java +++ b/compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java @@ -23,8 +23,6 @@ import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyAccessorDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; import org.jetbrains.jet.lang.psi.JetElement; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetVisitorVoid; @@ -94,7 +92,7 @@ public class DescriptorRendererTest extends JetLiteFixture { AnalyzeExhaust analyzeExhaust = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration( (JetFile) psiFile, Collections.emptyList(), - myEnvironment.getCompilerDependencies()); + myEnvironment.getCompilerDependencies().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 13bc0da4b00..99caf8a2188 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()); + jetCoreEnvironment.getCompilerDependencies().getCompilerSpecialMode()); BindingContext bindingContext = analyzeExhaust.getBindingContext(); for (Diagnostic diagnostic : bindingContext.getDiagnostics()) { if (diagnostic.getFactory() instanceof UnresolvedReferenceDiagnosticFactory) { diff --git a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java index c7e687d811f..f9ad5edc8ba 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()); + myEnvironment.getCompilerDependencies().getCompilerSpecialMode()); DeclarationDescriptor classDescriptor = bindingContext.getBindingContext().get(BindingContext.DECLARATION_TO_DESCRIPTOR, aClass); WritableScopeImpl scope = new WritableScopeImpl( libraryScope, root, RedeclarationHandler.DO_NOTHING, "JetDefaultModalityModifiersTest"); diff --git a/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java b/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java index 955eca3888e..95ccae166e4 100644 --- a/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java +++ b/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java @@ -88,8 +88,7 @@ public class AllInjectorsGenerator { private static void generateInjectorForTopDownAnalyzerForJvm() throws IOException { DependencyInjectorGenerator generator = new DependencyInjectorGenerator(false); generateInjectorForTopDownAnalyzerCommon(generator); - generator.addParameter(CompilerDependencies.class); - generator.addField(false, CompilerSpecialMode.class, null, new GivenExpression("compilerDependencies.getCompilerSpecialMode()")); + generator.addParameter(CompilerSpecialMode.class); generator.addPublicField(JavaBridgeConfiguration.class); generator.addField(JavaDescriptorResolver.class); generator.addField(PsiClassFinderImpl.class);