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 1dee211469a..70d701c2f60 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java @@ -235,8 +235,6 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly typeResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver); candidateResolver.setArgumentTypeResolver(argumentTypeResolver); - candidateResolver.setExpressionTypingServices(expressionTypingServices); - candidateResolver.setTypeResolver(typeResolver); importsResolver.setConfiguration(moduleConfiguration); importsResolver.setContext(topDownAnalysisContext); diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java index cd674b45868..d83af9ec5e0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java @@ -122,8 +122,6 @@ public class InjectorForBodyResolve { typeResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver); candidateResolver.setArgumentTypeResolver(argumentTypeResolver); - candidateResolver.setExpressionTypingServices(expressionTypingServices); - candidateResolver.setTypeResolver(typeResolver); controlFlowAnalyzer.setTopDownAnalysisParameters(topDownAnalysisParameters); controlFlowAnalyzer.setTrace(bindingTrace); diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java index 44239de6fff..f64704eeb3c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java @@ -96,8 +96,6 @@ public class InjectorForLazyResolve { argumentTypeResolver.setTypeResolver(typeResolver); candidateResolver.setArgumentTypeResolver(argumentTypeResolver); - candidateResolver.setExpressionTypingServices(expressionTypingServices); - candidateResolver.setTypeResolver(typeResolver); } diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java index 9fd45db5b04..a640e74fc56 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java @@ -85,8 +85,6 @@ public class InjectorForMacros { descriptorResolver.setTypeResolver(typeResolver); candidateResolver.setArgumentTypeResolver(argumentTypeResolver); - candidateResolver.setExpressionTypingServices(expressionTypingServices); - candidateResolver.setTypeResolver(typeResolver); } diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java index a5e6d40a3a5..5d207d262b6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java @@ -178,8 +178,6 @@ public class InjectorForTopDownAnalyzerBasic { typeResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver); candidateResolver.setArgumentTypeResolver(argumentTypeResolver); - candidateResolver.setExpressionTypingServices(expressionTypingServices); - candidateResolver.setTypeResolver(typeResolver); importsResolver.setConfiguration(moduleConfiguration); importsResolver.setContext(topDownAnalysisContext); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java index d352b9d1204..9ae2d887444 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java @@ -58,20 +58,6 @@ import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE; public class CandidateResolver { @NotNull private ArgumentTypeResolver argumentTypeResolver; - @NotNull - private TypeResolver typeResolver; - @NotNull - private ExpressionTypingServices expressionTypingServices; - - @Inject - public void setExpressionTypingServices(@NotNull ExpressionTypingServices expressionTypingServices) { - this.expressionTypingServices = expressionTypingServices; - } - - @Inject - public void setTypeResolver(@NotNull TypeResolver typeResolver) { - this.typeResolver = typeResolver; - } @Inject public void setArgumentTypeResolver(@NotNull ArgumentTypeResolver argumentTypeResolver) { diff --git a/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java b/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java index 4fb5161eb27..8f4a8a66707 100644 --- a/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java +++ b/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java @@ -87,8 +87,6 @@ public class InjectorForTests { argumentTypeResolver.setTypeResolver(typeResolver); candidateResolver.setArgumentTypeResolver(argumentTypeResolver); - candidateResolver.setExpressionTypingServices(expressionTypingServices); - candidateResolver.setTypeResolver(typeResolver); } diff --git a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java index e955c51e31e..619273fc1f1 100644 --- a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java @@ -178,8 +178,6 @@ public class InjectorForTopDownAnalyzerForJs { typeResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver); candidateResolver.setArgumentTypeResolver(argumentTypeResolver); - candidateResolver.setExpressionTypingServices(expressionTypingServices); - candidateResolver.setTypeResolver(typeResolver); importsResolver.setConfiguration(moduleConfiguration); importsResolver.setContext(topDownAnalysisContext);