Unnecessary beans removed

compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java

@@ -17,13 +17,14 @@
 
 package org.jetbrains.jet.di;
 
-import com.intellij.openapi.project.Project;
-import org.jetbrains.jet.lang.resolve.AnnotationResolver;
-import org.jetbrains.jet.lang.resolve.DescriptorResolver;
-import org.jetbrains.jet.lang.resolve.TypeResolver;
-import org.jetbrains.jet.lang.resolve.calls.CallResolver;
-import org.jetbrains.jet.lang.resolve.calls.OverloadingConflictResolver;
 import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
+import com.intellij.openapi.project.Project;
+import org.jetbrains.jet.lang.resolve.calls.CallResolver;
+import org.jetbrains.jet.lang.resolve.DescriptorResolver;
+import org.jetbrains.jet.lang.resolve.AnnotationResolver;
+import org.jetbrains.jet.lang.resolve.TypeResolver;
+import org.jetbrains.jet.lang.resolve.calls.OverloadingConflictResolver;
+import com.intellij.openapi.project.Project;
 
 /* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
 public class InjectorForMacros {

compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzer.java

@@ -22,7 +22,6 @@ import org.jetbrains.jet.lang.resolve.BodyResolver;
 import org.jetbrains.jet.lang.resolve.ControlFlowAnalyzer;
 import org.jetbrains.jet.lang.resolve.DeclarationsChecker;
 import org.jetbrains.jet.lang.resolve.DescriptorResolver;
-import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.jet.lang.resolve.TopDownAnalysisContext;
 import org.jetbrains.jet.lang.ModuleConfiguration;
@@ -30,8 +29,9 @@ import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory;
 import org.jetbrains.jet.lang.resolve.DeclarationResolver;
 import org.jetbrains.jet.lang.resolve.AnnotationResolver;
 import org.jetbrains.jet.lang.resolve.calls.CallResolver;
-import org.jetbrains.jet.lang.resolve.calls.OverloadingConflictResolver;
+import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
 import org.jetbrains.jet.lang.resolve.TypeResolver;
+import org.jetbrains.jet.lang.resolve.calls.OverloadingConflictResolver;
 import org.jetbrains.jet.lang.resolve.ImportsResolver;
 import org.jetbrains.jet.lang.resolve.DelegationResolver;
 import org.jetbrains.jet.lang.resolve.OverloadResolver;
@@ -50,28 +50,26 @@ public class InjectorForTopDownAnalyzer {
     private ControlFlowAnalyzer controlFlowAnalyzer;
     private DeclarationsChecker declarationsChecker;
     private DescriptorResolver descriptorResolver;
-    private ExpressionTypingServices expressionTypingServices;
     private final Project project;
 
     public InjectorForTopDownAnalyzer(
         Project project,
         TopDownAnalysisContext topDownAnalysisContext,
         ModuleConfiguration moduleConfiguration,
-        JetControlFlowDataTraceFactory jetControlFlowDataTraceFactory,
+        JetControlFlowDataTraceFactory jetControlFlowDataTraceFactory
-        boolean analyzingBootstrapLibrary
     ) {
         this.topDownAnalyzer = new TopDownAnalyzer();
         this.bodyResolver = new BodyResolver();
         this.controlFlowAnalyzer = new ControlFlowAnalyzer();
         this.declarationsChecker = new DeclarationsChecker();
         this.descriptorResolver = new DescriptorResolver();
-        this.expressionTypingServices = new ExpressionTypingServices();
         this.project = project;
         DeclarationResolver declarationResolver = new DeclarationResolver();
         AnnotationResolver annotationResolver = new AnnotationResolver();
         CallResolver callResolver = new CallResolver();
-        OverloadingConflictResolver overloadingConflictResolver = new OverloadingConflictResolver();
+        ExpressionTypingServices expressionTypingServices = new ExpressionTypingServices();
         TypeResolver typeResolver = new TypeResolver();
+        OverloadingConflictResolver overloadingConflictResolver = new OverloadingConflictResolver();
         ImportsResolver importsResolver = new ImportsResolver();
         DelegationResolver delegationResolver = new DelegationResolver();
         OverloadResolver overloadResolver = new OverloadResolver();
@@ -98,11 +96,6 @@ public class InjectorForTopDownAnalyzer {
         this.descriptorResolver.setExpressionTypingServices(expressionTypingServices);
         this.descriptorResolver.setTypeResolver(typeResolver);
 
-        this.expressionTypingServices.setCallResolver(callResolver);
-        this.expressionTypingServices.setDescriptorResolver(descriptorResolver);
-        this.expressionTypingServices.setProject(project);
-        this.expressionTypingServices.setTypeResolver(typeResolver);
-
         declarationResolver.setAnnotationResolver(annotationResolver);
         declarationResolver.setContext(topDownAnalysisContext);
         declarationResolver.setDescriptorResolver(descriptorResolver);
@@ -116,6 +109,11 @@ public class InjectorForTopDownAnalyzer {
         callResolver.setOverloadingConflictResolver(overloadingConflictResolver);
         callResolver.setTypeResolver(typeResolver);
 
+        expressionTypingServices.setCallResolver(callResolver);
+        expressionTypingServices.setDescriptorResolver(descriptorResolver);
+        expressionTypingServices.setProject(project);
+        expressionTypingServices.setTypeResolver(typeResolver);
+
         typeResolver.setAnnotationResolver(annotationResolver);
         typeResolver.setDescriptorResolver(descriptorResolver);
 
@@ -155,10 +153,6 @@ public class InjectorForTopDownAnalyzer {
         return this.descriptorResolver;
     }
 
-    public ExpressionTypingServices getExpressionTypingServices() {
-        return this.expressionTypingServices;
-    }
-
     public Project getProject() {
         return this.project;
     }

compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java

@@ -76,7 +76,7 @@ public class TopDownAnalysisContext {
                     "jetControlFlowDataTraceFactory must not be passed when analyzingBootstrapLibrary and vice versa");
         }
 
-        this.injector = new InjectorForTopDownAnalyzer(project, this, configuration, jetControlFlowDataTraceFactory, analyzingBootstrapLibrary);
+        this.injector = new InjectorForTopDownAnalyzer(project, this, configuration, jetControlFlowDataTraceFactory);
 
         this.trace = new ObservableBindingTrace(trace);
         this.analyzeCompletely = analyzeCompletely;

compiler/tests/org/jetbrains/jet/di/InjectorForTests.java

@@ -17,14 +17,15 @@
 
 package org.jetbrains.jet.di;
 
-import com.intellij.openapi.project.Project;
-import org.jetbrains.jet.lang.resolve.AnnotationResolver;
 import org.jetbrains.jet.lang.resolve.DescriptorResolver;
+import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
 import org.jetbrains.jet.lang.resolve.TypeResolver;
 import org.jetbrains.jet.lang.resolve.calls.CallResolver;
-import org.jetbrains.jet.lang.resolve.calls.OverloadingConflictResolver;
-import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
 import org.jetbrains.jet.lang.types.lang.JetStandardLibrary;
+import com.intellij.openapi.project.Project;
+import org.jetbrains.jet.lang.resolve.AnnotationResolver;
+import org.jetbrains.jet.lang.resolve.calls.OverloadingConflictResolver;
+import com.intellij.openapi.project.Project;
 
 /* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
 public class InjectorForTests {

injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java

@@ -27,8 +27,10 @@ import org.jetbrains.jet.lang.types.lang.JetStandardLibrary;
 import java.io.IOException;
 
 /**
-* @author abreslav
+ * @author abreslav
-*/
+ */
+// NOTE: After making changes, you need to re-generate the injectors.
+//       To do that, you can run either this class, or /build.xml/generateInjectors task
 public class AllInjectorsGenerator {
 
     public static void main(String[] args) throws IOException {
@@ -46,14 +48,12 @@ public class AllInjectorsGenerator {
         generator.addPublicField(ControlFlowAnalyzer.class);
         generator.addPublicField(DeclarationsChecker.class);
         generator.addPublicField(DescriptorResolver.class);
-        generator.addPublicField(ExpressionTypingServices.class);
 
         // Parameters
         generator.addPublicParameter(Project.class);
         generator.addParameter(TopDownAnalysisContext.class);
         generator.addParameter(ModuleConfiguration.class);
         generator.addParameter(JetControlFlowDataTraceFactory.class);
-        generator.addParameter(false, boolean.class, "analyzingBootstrapLibrary");
 
         generator.generate("compiler/frontend/src", "org.jetbrains.jet.di", "InjectorForTopDownAnalyzer");
     }