Remove unused dependencies from JavaDescriptorResolver
This commit is contained in:
@@ -102,10 +102,7 @@ public class InjectorForJavaDescriptorResolver {
|
|||||||
this.javaDescriptorResolver.setFunctionResolver(javaFunctionResolver);
|
this.javaDescriptorResolver.setFunctionResolver(javaFunctionResolver);
|
||||||
this.javaDescriptorResolver.setInnerClassResolver(javaInnerClassResolver);
|
this.javaDescriptorResolver.setInnerClassResolver(javaInnerClassResolver);
|
||||||
this.javaDescriptorResolver.setNamespaceResolver(javaNamespaceResolver);
|
this.javaDescriptorResolver.setNamespaceResolver(javaNamespaceResolver);
|
||||||
this.javaDescriptorResolver.setProject(project);
|
|
||||||
this.javaDescriptorResolver.setPropertiesResolver(javaPropertiesResolver);
|
this.javaDescriptorResolver.setPropertiesResolver(javaPropertiesResolver);
|
||||||
this.javaDescriptorResolver.setSemanticServices(javaSemanticServices);
|
|
||||||
this.javaDescriptorResolver.setTrace(bindingTrace);
|
|
||||||
|
|
||||||
this.psiClassFinder.setProject(project);
|
this.psiClassFinder.setProject(project);
|
||||||
|
|
||||||
|
|||||||
@@ -96,10 +96,7 @@ public class InjectorForJavaSemanticServices {
|
|||||||
this.javaDescriptorResolver.setFunctionResolver(javaFunctionResolver);
|
this.javaDescriptorResolver.setFunctionResolver(javaFunctionResolver);
|
||||||
this.javaDescriptorResolver.setInnerClassResolver(javaInnerClassResolver);
|
this.javaDescriptorResolver.setInnerClassResolver(javaInnerClassResolver);
|
||||||
this.javaDescriptorResolver.setNamespaceResolver(javaNamespaceResolver);
|
this.javaDescriptorResolver.setNamespaceResolver(javaNamespaceResolver);
|
||||||
this.javaDescriptorResolver.setProject(project);
|
|
||||||
this.javaDescriptorResolver.setPropertiesResolver(javaPropertiesResolver);
|
this.javaDescriptorResolver.setPropertiesResolver(javaPropertiesResolver);
|
||||||
this.javaDescriptorResolver.setSemanticServices(javaSemanticServices);
|
|
||||||
this.javaDescriptorResolver.setTrace(bindingTrace);
|
|
||||||
|
|
||||||
javaBridgeConfiguration.setBuiltinsScopeExtensionMode(builtinsScopeExtensionMode);
|
javaBridgeConfiguration.setBuiltinsScopeExtensionMode(builtinsScopeExtensionMode);
|
||||||
javaBridgeConfiguration.setJavaSemanticServices(javaSemanticServices);
|
javaBridgeConfiguration.setJavaSemanticServices(javaSemanticServices);
|
||||||
|
|||||||
@@ -194,10 +194,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.setProject(project);
|
|
||||||
javaDescriptorResolver.setPropertiesResolver(javaPropertiesResolver);
|
javaDescriptorResolver.setPropertiesResolver(javaPropertiesResolver);
|
||||||
javaDescriptorResolver.setSemanticServices(javaSemanticServices);
|
|
||||||
javaDescriptorResolver.setTrace(bindingTrace);
|
|
||||||
|
|
||||||
psiClassFinder.setProject(project);
|
psiClassFinder.setProject(project);
|
||||||
|
|
||||||
|
|||||||
-24
@@ -16,12 +16,10 @@
|
|||||||
|
|
||||||
package org.jetbrains.jet.lang.resolve.java;
|
package org.jetbrains.jet.lang.resolve.java;
|
||||||
|
|
||||||
import com.intellij.openapi.project.Project;
|
|
||||||
import com.intellij.psi.PsiClass;
|
import com.intellij.psi.PsiClass;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.jetbrains.jet.lang.descriptors.*;
|
import org.jetbrains.jet.lang.descriptors.*;
|
||||||
import org.jetbrains.jet.lang.resolve.BindingTrace;
|
|
||||||
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
|
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
|
||||||
import org.jetbrains.jet.lang.resolve.java.data.ResolverClassData;
|
import org.jetbrains.jet.lang.resolve.java.data.ResolverClassData;
|
||||||
import org.jetbrains.jet.lang.resolve.java.data.ResolverScopeData;
|
import org.jetbrains.jet.lang.resolve.java.data.ResolverScopeData;
|
||||||
@@ -61,9 +59,6 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
protected Project project;
|
|
||||||
protected JavaSemanticServices semanticServices;
|
|
||||||
private BindingTrace trace;
|
|
||||||
private JavaPropertiesResolver propertiesResolver;
|
private JavaPropertiesResolver propertiesResolver;
|
||||||
private JavaClassResolver classResolver;
|
private JavaClassResolver classResolver;
|
||||||
private JavaConstructorResolver constructorResolver;
|
private JavaConstructorResolver constructorResolver;
|
||||||
@@ -71,21 +66,6 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
|
|||||||
private JavaNamespaceResolver namespaceResolver;
|
private JavaNamespaceResolver namespaceResolver;
|
||||||
private JavaInnerClassResolver innerClassResolver;
|
private JavaInnerClassResolver innerClassResolver;
|
||||||
|
|
||||||
@Inject
|
|
||||||
public void setProject(Project project) {
|
|
||||||
this.project = project;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
public void setSemanticServices(JavaSemanticServices semanticServices) {
|
|
||||||
this.semanticServices = semanticServices;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
public void setTrace(BindingTrace trace) {
|
|
||||||
this.trace = trace;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
public void setFunctionResolver(JavaFunctionResolver functionResolver) {
|
public void setFunctionResolver(JavaFunctionResolver functionResolver) {
|
||||||
this.functionResolver = functionResolver;
|
this.functionResolver = functionResolver;
|
||||||
@@ -126,10 +106,6 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
|
|||||||
return classResolver.resolveClass(qualifiedName);
|
return classResolver.resolveClass(qualifiedName);
|
||||||
}
|
}
|
||||||
|
|
||||||
public BindingTrace getTrace() {
|
|
||||||
return trace;
|
|
||||||
}
|
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
public Collection<ConstructorDescriptor> resolveConstructors(@NotNull ResolverClassData classData) {
|
public Collection<ConstructorDescriptor> resolveConstructors(@NotNull ResolverClassData classData) {
|
||||||
return constructorResolver.resolveConstructors(classData);
|
return constructorResolver.resolveConstructors(classData);
|
||||||
|
|||||||
+1
-1
@@ -257,7 +257,7 @@ public final class JavaClassResolver {
|
|||||||
|
|
||||||
classData.getClassDescriptor().setAnnotations(annotationResolver.resolveAnnotations(psiClass, taskList));
|
classData.getClassDescriptor().setAnnotations(annotationResolver.resolveAnnotations(psiClass, taskList));
|
||||||
|
|
||||||
javaDescriptorResolver.getTrace().record(BindingContext.CLASS, psiClass, classData.getClassDescriptor());
|
trace.record(BindingContext.CLASS, psiClass, classData.getClassDescriptor());
|
||||||
|
|
||||||
return classData;
|
return classData;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user