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 a54e1f57214..0761203cd7f 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java @@ -23,13 +23,12 @@ 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.resolve.java.CompilerDependencies; import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode; import com.intellij.openapi.project.Project; import org.jetbrains.jet.lang.resolve.java.JavaTypeTransformer; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorSignatureResolver; import org.jetbrains.jet.lang.resolve.NamespaceFactoryImpl; -import org.jetbrains.jet.lang.resolve.java.CompilerDependencies; +import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; @@ -43,15 +42,14 @@ public class InjectorForJavaSemanticServices { private JavaBridgeConfiguration javaBridgeConfiguration; private PsiClassFinderImpl psiClassFinder; private ModuleDescriptor moduleDescriptor; - private final CompilerDependencies compilerDependencies; - private CompilerSpecialMode compilerSpecialMode; + private final CompilerSpecialMode compilerSpecialMode; private final Project project; private JavaTypeTransformer javaTypeTransformer; private JavaDescriptorSignatureResolver javaDescriptorSignatureResolver; private NamespaceFactoryImpl namespaceFactory; public InjectorForJavaSemanticServices( - @NotNull CompilerDependencies compilerDependencies, + @NotNull CompilerSpecialMode compilerSpecialMode, @NotNull Project project ) { this.javaSemanticServices = new JavaSemanticServices(); @@ -60,8 +58,7 @@ public class InjectorForJavaSemanticServices { 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.compilerDependencies = compilerDependencies; - this.compilerSpecialMode = compilerDependencies.getCompilerSpecialMode(); + this.compilerSpecialMode = compilerSpecialMode; this.project = project; this.javaTypeTransformer = new JavaTypeTransformer(); this.javaDescriptorSignatureResolver = new JavaDescriptorSignatureResolver(); diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/JavaDescriptorResolverTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/JavaDescriptorResolverTest.java index 13d4c760a87..193140dfce2 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/JavaDescriptorResolverTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/JavaDescriptorResolverTest.java @@ -74,7 +74,7 @@ public class JavaDescriptorResolverTest extends TestCaseWithTmpdir { jetCoreEnvironment.addToClasspath(tmpdir); InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices( - jetCoreEnvironment.getCompilerDependencies(), jetCoreEnvironment.getProject()); + CompilerSpecialMode.JDK_HEADERS, jetCoreEnvironment.getProject()); return injector.getJavaDescriptorResolver(); } @@ -83,7 +83,7 @@ public class JavaDescriptorResolverTest extends TestCaseWithTmpdir { .jdkAnnotationsForTests(), null)); InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices( - jetCoreEnvironment.getCompilerDependencies(), jetCoreEnvironment.getProject()); + CompilerSpecialMode.IDEA, jetCoreEnvironment.getProject()); // java.lang.Iterable must exist in jdk-headers otherwize this test is meaningless, resolveClass always returns null injector.getJavaDescriptorResolver().resolveClass(new FqName("java.lang.Iterable")); diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTest.java index 1e657daeca6..90c5e6fda7c 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTest.java @@ -118,7 +118,7 @@ public class ReadJavaBinaryClassTest extends TestCaseWithTmpdir { jetCoreEnvironment.addToClasspath(new File("out/production/runtime")); InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices( - jetCoreEnvironment.getCompilerDependencies(), jetCoreEnvironment.getProject()); + CompilerSpecialMode.JDK_HEADERS, jetCoreEnvironment.getProject()); JavaDescriptorResolver javaDescriptorResolver = injector.getJavaDescriptorResolver(); return javaDescriptorResolver.resolveNamespace(FqName.topLevel(Name.identifier("test")), DescriptorSearchRule.ERROR_IF_FOUND_IN_KOTLIN); } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadKotlinBinaryClassTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadKotlinBinaryClassTest.java index 42b41dd942c..05998b48c29 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(), jetCoreEnvironment.getProject()); + jetCoreEnvironment.getCompilerDependencies().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/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java index ed1bcff32ab..384c9df992b 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java @@ -160,7 +160,7 @@ public class ResolveDescriptorsFromExternalLibraries { } - InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(jetCoreEnvironment.getCompilerDependencies(), jetCoreEnvironment.getProject()); + InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(CompilerSpecialMode.STDLIB, jetCoreEnvironment.getProject()); boolean hasErrors; try { diff --git a/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java b/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java index bd773e56baa..c3825df0409 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(), project); + myEnvironment.getCompilerDependencies().getCompilerSpecialMode(), project); return injector.getPsiClassFinder().findPsiClass(new FqName(qualifiedName), PsiClassFinder.RuntimeClassesHandleMode.THROW); } diff --git a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java index c0cf7c46ba8..959028adecc 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(), getProject()); + myEnvironment.getCompilerDependencies().getCompilerSpecialMode(), getProject()); JavaDescriptorResolver javaDescriptorResolver = injector.getJavaDescriptorResolver(); writableScope.importScope(javaDescriptorResolver.resolveNamespace(FqName.ROOT, DescriptorSearchRule.INCLUDE_KOTLIN).getMemberScope()); diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java index 5db6410d3ca..e24632f1c84 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java @@ -62,8 +62,7 @@ class DecompiledDataFactory { private DecompiledDataFactory(ClsFileImpl clsFile) { myClsFile = clsFile; Project project = myClsFile.getProject(); - InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices( - CompilerDependencies.compilerDependenciesForProduction(CompilerSpecialMode.REGULAR), project); + InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(CompilerSpecialMode.REGULAR, project); myBindingContext = injector.getBindingTrace().getBindingContext(); myJavaDescriptorResolver = injector.getJavaDescriptorResolver(); } diff --git a/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java b/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java index 95ccae166e4..51715f3ec62 100644 --- a/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java +++ b/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java @@ -152,8 +152,7 @@ public class AllInjectorsGenerator { generator.addPublicField(PsiClassFinderImpl.class); generator.addField(false, ModuleDescriptor.class, null, new GivenExpression("new org.jetbrains.jet.lang.descriptors.ModuleDescriptor(org.jetbrains.jet.lang.resolve.name.Name.special(\"\"))")); - generator.addParameter(CompilerDependencies.class); - generator.addField(false, CompilerSpecialMode.class, null, new GivenExpression("compilerDependencies.getCompilerSpecialMode()")); + generator.addParameter(CompilerSpecialMode.class); // Parameters generator.addPublicParameter(Project.class);