azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Injectors regenerated

Browse Source
This commit is contained in:
Mikhael Bogdanov
2013-10-23 14:46:34 +04:00
parent 4c459fe62c
commit 88a43fac5f
8 changed files with 59 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/di/InjectorForTests.java
+4 -4
View File
@@ -20,7 +20,7 @@ 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.CompositeExtension;
import org.jetbrains.jet.lang.resolve.calls.CallResolverExtensionProvider;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lang.PlatformToKotlinClassMap;
import com.intellij.openapi.project.Project;
@@ -41,7 +41,7 @@ public class InjectorForTests {
private final ExpressionTypingServices expressionTypingServices;
private final TypeResolver typeResolver;
private final CallResolver callResolver;
private final CompositeExtension compositeExtension;
private final CallResolverExtensionProvider callResolverExtensionProvider;
private final KotlinBuiltIns kotlinBuiltIns;
private final PlatformToKotlinClassMap platformToKotlinClassMap;
private final Project project;
@@ -61,7 +61,7 @@ public class InjectorForTests {
this.expressionTypingServices = new ExpressionTypingServices();
this.typeResolver = new TypeResolver();
this.callResolver = new CallResolver();
this.compositeExtension = new CompositeExtension();
this.callResolverExtensionProvider = new CallResolverExtensionProvider();
this.kotlinBuiltIns = KotlinBuiltIns.getInstance();
this.platformToKotlinClassMap = moduleDescriptor.getPlatformToKotlinClassMap();
this.project = project;
@@ -82,6 +82,7 @@ public class InjectorForTests {
this.expressionTypingServices.setCallExpressionResolver(callExpressionResolver);
this.expressionTypingServices.setCallResolver(callResolver);
this.expressionTypingServices.setDescriptorResolver(descriptorResolver);
this.expressionTypingServices.setExtensionProvider(callResolverExtensionProvider);
this.expressionTypingServices.setPlatformToKotlinClassMap(platformToKotlinClassMap);
this.expressionTypingServices.setProject(project);
this.expressionTypingServices.setTypeResolver(typeResolver);
@@ -93,7 +94,6 @@ public class InjectorForTests {
this.callResolver.setArgumentTypeResolver(argumentTypeResolver);
this.callResolver.setCandidateResolver(candidateResolver);
this.callResolver.setExpressionTypingServices(expressionTypingServices);
this.callResolver.setExtension(compositeExtension);
this.callResolver.setTypeResolver(typeResolver);
annotationResolver.setCallResolver(callResolver);