Regenerate injectors after update
This commit is contained in:
+18
-18
@@ -53,14 +53,14 @@ import org.jetbrains.jet.lang.resolve.java.resolver.JavaClassResolver;
|
|||||||
import org.jetbrains.jet.lang.resolve.java.resolver.JavaAnnotationResolver;
|
import org.jetbrains.jet.lang.resolve.java.resolver.JavaAnnotationResolver;
|
||||||
import org.jetbrains.jet.lang.resolve.java.resolver.JavaCompileTimeConstResolver;
|
import org.jetbrains.jet.lang.resolve.java.resolver.JavaCompileTimeConstResolver;
|
||||||
import org.jetbrains.jet.lang.resolve.java.resolver.JavaClassObjectResolver;
|
import org.jetbrains.jet.lang.resolve.java.resolver.JavaClassObjectResolver;
|
||||||
import org.jetbrains.jet.lang.resolve.java.resolver.JavaSupertypesResolver;
|
import org.jetbrains.jet.lang.resolve.java.resolver.JavaSupertypeResolver;
|
||||||
import org.jetbrains.jet.lang.resolve.java.resolver.JavaNamespaceResolver;
|
import org.jetbrains.jet.lang.resolve.java.resolver.JavaNamespaceResolver;
|
||||||
import org.jetbrains.jet.lang.resolve.java.resolver.JavaSignatureResolver;
|
import org.jetbrains.jet.lang.resolve.java.resolver.JavaSignatureResolver;
|
||||||
import org.jetbrains.jet.lang.resolve.java.resolver.JavaConstructorResolver;
|
import org.jetbrains.jet.lang.resolve.java.resolver.JavaConstructorResolver;
|
||||||
import org.jetbrains.jet.lang.resolve.java.resolver.JavaValueParameterResolver;
|
import org.jetbrains.jet.lang.resolve.java.resolver.JavaValueParameterResolver;
|
||||||
import org.jetbrains.jet.lang.resolve.java.resolver.JavaFunctionResolver;
|
import org.jetbrains.jet.lang.resolve.java.resolver.JavaFunctionResolver;
|
||||||
import org.jetbrains.jet.lang.resolve.java.resolver.JavaInnerClassResolver;
|
import org.jetbrains.jet.lang.resolve.java.resolver.JavaInnerClassResolver;
|
||||||
import org.jetbrains.jet.lang.resolve.java.resolver.JavaPropertiesResolver;
|
import org.jetbrains.jet.lang.resolve.java.resolver.JavaPropertyResolver;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import javax.annotation.PreDestroy;
|
import javax.annotation.PreDestroy;
|
||||||
|
|
||||||
@@ -102,14 +102,14 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
|
|||||||
private JavaAnnotationResolver javaAnnotationResolver;
|
private JavaAnnotationResolver javaAnnotationResolver;
|
||||||
private JavaCompileTimeConstResolver javaCompileTimeConstResolver;
|
private JavaCompileTimeConstResolver javaCompileTimeConstResolver;
|
||||||
private JavaClassObjectResolver javaClassObjectResolver;
|
private JavaClassObjectResolver javaClassObjectResolver;
|
||||||
private JavaSupertypesResolver javaSupertypesResolver;
|
private JavaSupertypeResolver javaSupertypeResolver;
|
||||||
private JavaNamespaceResolver javaNamespaceResolver;
|
private JavaNamespaceResolver javaNamespaceResolver;
|
||||||
private JavaSignatureResolver javaSignatureResolver;
|
private JavaSignatureResolver javaSignatureResolver;
|
||||||
private JavaConstructorResolver javaConstructorResolver;
|
private JavaConstructorResolver javaConstructorResolver;
|
||||||
private JavaValueParameterResolver javaValueParameterResolver;
|
private JavaValueParameterResolver javaValueParameterResolver;
|
||||||
private JavaFunctionResolver javaFunctionResolver;
|
private JavaFunctionResolver javaFunctionResolver;
|
||||||
private JavaInnerClassResolver javaInnerClassResolver;
|
private JavaInnerClassResolver javaInnerClassResolver;
|
||||||
private JavaPropertiesResolver javaPropertiesResolver;
|
private JavaPropertyResolver javaPropertyResolver;
|
||||||
|
|
||||||
public InjectorForTopDownAnalyzerForJvm(
|
public InjectorForTopDownAnalyzerForJvm(
|
||||||
@NotNull Project project,
|
@NotNull Project project,
|
||||||
@@ -152,14 +152,14 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
|
|||||||
this.javaAnnotationResolver = new JavaAnnotationResolver();
|
this.javaAnnotationResolver = new JavaAnnotationResolver();
|
||||||
this.javaCompileTimeConstResolver = new JavaCompileTimeConstResolver();
|
this.javaCompileTimeConstResolver = new JavaCompileTimeConstResolver();
|
||||||
this.javaClassObjectResolver = new JavaClassObjectResolver();
|
this.javaClassObjectResolver = new JavaClassObjectResolver();
|
||||||
this.javaSupertypesResolver = new JavaSupertypesResolver();
|
this.javaSupertypeResolver = new JavaSupertypeResolver();
|
||||||
this.javaNamespaceResolver = new JavaNamespaceResolver();
|
this.javaNamespaceResolver = new JavaNamespaceResolver();
|
||||||
this.javaSignatureResolver = new JavaSignatureResolver();
|
this.javaSignatureResolver = new JavaSignatureResolver();
|
||||||
this.javaConstructorResolver = new JavaConstructorResolver();
|
this.javaConstructorResolver = new JavaConstructorResolver();
|
||||||
this.javaValueParameterResolver = new JavaValueParameterResolver();
|
this.javaValueParameterResolver = new JavaValueParameterResolver();
|
||||||
this.javaFunctionResolver = new JavaFunctionResolver();
|
this.javaFunctionResolver = new JavaFunctionResolver();
|
||||||
this.javaInnerClassResolver = new JavaInnerClassResolver();
|
this.javaInnerClassResolver = new JavaInnerClassResolver();
|
||||||
this.javaPropertiesResolver = new JavaPropertiesResolver();
|
this.javaPropertyResolver = new JavaPropertyResolver();
|
||||||
|
|
||||||
this.topDownAnalyzer.setBodyResolver(bodyResolver);
|
this.topDownAnalyzer.setBodyResolver(bodyResolver);
|
||||||
this.topDownAnalyzer.setContext(topDownAnalysisContext);
|
this.topDownAnalyzer.setContext(topDownAnalysisContext);
|
||||||
@@ -201,7 +201,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
|
|||||||
javaDescriptorResolver.setFunctionResolver(javaFunctionResolver);
|
javaDescriptorResolver.setFunctionResolver(javaFunctionResolver);
|
||||||
javaDescriptorResolver.setInnerClassResolver(javaInnerClassResolver);
|
javaDescriptorResolver.setInnerClassResolver(javaInnerClassResolver);
|
||||||
javaDescriptorResolver.setNamespaceResolver(javaNamespaceResolver);
|
javaDescriptorResolver.setNamespaceResolver(javaNamespaceResolver);
|
||||||
javaDescriptorResolver.setPropertiesResolver(javaPropertiesResolver);
|
javaDescriptorResolver.setPropertiesResolver(javaPropertyResolver);
|
||||||
|
|
||||||
psiClassFinder.setProject(project);
|
psiClassFinder.setProject(project);
|
||||||
|
|
||||||
@@ -283,7 +283,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
|
|||||||
javaClassResolver.setPsiClassFinder(psiClassFinder);
|
javaClassResolver.setPsiClassFinder(psiClassFinder);
|
||||||
javaClassResolver.setSemanticServices(javaSemanticServices);
|
javaClassResolver.setSemanticServices(javaSemanticServices);
|
||||||
javaClassResolver.setSignatureResolver(javaSignatureResolver);
|
javaClassResolver.setSignatureResolver(javaSignatureResolver);
|
||||||
javaClassResolver.setSupertypesResolver(javaSupertypesResolver);
|
javaClassResolver.setSupertypesResolver(javaSupertypeResolver);
|
||||||
javaClassResolver.setTrace(bindingTrace);
|
javaClassResolver.setTrace(bindingTrace);
|
||||||
|
|
||||||
javaAnnotationResolver.setClassResolver(javaClassResolver);
|
javaAnnotationResolver.setClassResolver(javaClassResolver);
|
||||||
@@ -294,13 +294,13 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
|
|||||||
|
|
||||||
javaClassObjectResolver.setJavaDescriptorResolver(javaDescriptorResolver);
|
javaClassObjectResolver.setJavaDescriptorResolver(javaDescriptorResolver);
|
||||||
javaClassObjectResolver.setSemanticServices(javaSemanticServices);
|
javaClassObjectResolver.setSemanticServices(javaSemanticServices);
|
||||||
javaClassObjectResolver.setSupertypesResolver(javaSupertypesResolver);
|
javaClassObjectResolver.setSupertypesResolver(javaSupertypeResolver);
|
||||||
javaClassObjectResolver.setTrace(bindingTrace);
|
javaClassObjectResolver.setTrace(bindingTrace);
|
||||||
|
|
||||||
javaSupertypesResolver.setClassResolver(javaClassResolver);
|
javaSupertypeResolver.setClassResolver(javaClassResolver);
|
||||||
javaSupertypesResolver.setSemanticServices(javaSemanticServices);
|
javaSupertypeResolver.setSemanticServices(javaSemanticServices);
|
||||||
javaSupertypesResolver.setTrace(bindingTrace);
|
javaSupertypeResolver.setTrace(bindingTrace);
|
||||||
javaSupertypesResolver.setTypeTransformer(javaTypeTransformer);
|
javaSupertypeResolver.setTypeTransformer(javaTypeTransformer);
|
||||||
|
|
||||||
javaNamespaceResolver.setJavaSemanticServices(javaSemanticServices);
|
javaNamespaceResolver.setJavaSemanticServices(javaSemanticServices);
|
||||||
javaNamespaceResolver.setPsiClassFinder(psiClassFinder);
|
javaNamespaceResolver.setPsiClassFinder(psiClassFinder);
|
||||||
@@ -322,11 +322,11 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
|
|||||||
|
|
||||||
javaInnerClassResolver.setClassResolver(javaClassResolver);
|
javaInnerClassResolver.setClassResolver(javaClassResolver);
|
||||||
|
|
||||||
javaPropertiesResolver.setAnnotationResolver(javaAnnotationResolver);
|
javaPropertyResolver.setAnnotationResolver(javaAnnotationResolver);
|
||||||
javaPropertiesResolver.setClassResolver(javaClassResolver);
|
javaPropertyResolver.setClassResolver(javaClassResolver);
|
||||||
javaPropertiesResolver.setJavaSignatureResolver(javaSignatureResolver);
|
javaPropertyResolver.setJavaSignatureResolver(javaSignatureResolver);
|
||||||
javaPropertiesResolver.setSemanticServices(javaSemanticServices);
|
javaPropertyResolver.setSemanticServices(javaSemanticServices);
|
||||||
javaPropertiesResolver.setTrace(bindingTrace);
|
javaPropertyResolver.setTrace(bindingTrace);
|
||||||
|
|
||||||
moduleConfiguration.init();
|
moduleConfiguration.init();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user