From ee2976d380b1fa3d7e78b38e3212b83f41e2aafd Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Tue, 13 Mar 2012 20:30:42 +0400 Subject: [PATCH] Unnecessary beans removed --- .../jetbrains/jet/di/InjectorForMacros.java | 13 +++++----- .../jet/di/InjectorForTopDownAnalyzer.java | 26 +++++++------------ .../lang/resolve/TopDownAnalysisContext.java | 2 +- .../jetbrains/jet/di/InjectorForTests.java | 9 ++++--- .../jet/di/AllInjectorsGenerator.java | 8 +++--- 5 files changed, 27 insertions(+), 31 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java index c80ad3cba1d..e4cec523959 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java +++ b/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 { diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzer.java index 21bed5464d9..3d12be7e1a9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzer.java +++ b/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, - boolean analyzingBootstrapLibrary + JetControlFlowDataTraceFactory jetControlFlowDataTraceFactory ) { 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; } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java index f6bb8c62eb0..6280c49681e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java +++ b/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; diff --git a/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java b/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java index 6194948c399..d2e3a173b6b 100644 --- a/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java +++ b/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 { diff --git a/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java b/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java index bfc174ce111..56659e443c8 100644 --- a/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java +++ b/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"); }