Do not inject TopDownAnalysisParameters into ScriptHeaderResolver
This commit is contained in:
@@ -275,7 +275,6 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
|
|||||||
|
|
||||||
scriptHeaderResolver.setDependencyClassByQualifiedNameResolver(javaDescriptorResolver);
|
scriptHeaderResolver.setDependencyClassByQualifiedNameResolver(javaDescriptorResolver);
|
||||||
scriptHeaderResolver.setPackageFragmentProvider(mutablePackageFragmentProvider);
|
scriptHeaderResolver.setPackageFragmentProvider(mutablePackageFragmentProvider);
|
||||||
scriptHeaderResolver.setTopDownAnalysisParameters(topDownAnalysisParameters);
|
|
||||||
scriptHeaderResolver.setTrace(bindingTrace);
|
scriptHeaderResolver.setTrace(bindingTrace);
|
||||||
|
|
||||||
overloadResolver.setTrace(bindingTrace);
|
overloadResolver.setTrace(bindingTrace);
|
||||||
|
|||||||
@@ -230,7 +230,6 @@ public class InjectorForTopDownAnalyzerBasic {
|
|||||||
|
|
||||||
scriptHeaderResolver.setDependencyClassByQualifiedNameResolver(dependencyClassByQualifiedNameResolverDummy);
|
scriptHeaderResolver.setDependencyClassByQualifiedNameResolver(dependencyClassByQualifiedNameResolverDummy);
|
||||||
scriptHeaderResolver.setPackageFragmentProvider(mutablePackageFragmentProvider);
|
scriptHeaderResolver.setPackageFragmentProvider(mutablePackageFragmentProvider);
|
||||||
scriptHeaderResolver.setTopDownAnalysisParameters(topDownAnalysisParameters);
|
|
||||||
scriptHeaderResolver.setTrace(bindingTrace);
|
scriptHeaderResolver.setTrace(bindingTrace);
|
||||||
|
|
||||||
overloadResolver.setTrace(bindingTrace);
|
overloadResolver.setTrace(bindingTrace);
|
||||||
|
|||||||
@@ -56,8 +56,6 @@ public class ScriptHeaderResolver {
|
|||||||
private DependencyClassByQualifiedNameResolver dependencyClassByQualifiedNameResolver;
|
private DependencyClassByQualifiedNameResolver dependencyClassByQualifiedNameResolver;
|
||||||
@NotNull
|
@NotNull
|
||||||
private BindingTrace trace;
|
private BindingTrace trace;
|
||||||
@NotNull
|
|
||||||
private TopDownAnalysisParameters topDownAnalysisParameters;
|
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
public void setPackageFragmentProvider(@NotNull MutablePackageFragmentProvider packageFragmentProvider) {
|
public void setPackageFragmentProvider(@NotNull MutablePackageFragmentProvider packageFragmentProvider) {
|
||||||
@@ -74,11 +72,6 @@ public class ScriptHeaderResolver {
|
|||||||
this.trace = trace;
|
this.trace = trace;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject
|
|
||||||
public void setTopDownAnalysisParameters(@NotNull TopDownAnalysisParameters topDownAnalysisParameters) {
|
|
||||||
this.topDownAnalysisParameters = topDownAnalysisParameters;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
private ClassDescriptor resolveClass(@NotNull FqName className) {
|
private ClassDescriptor resolveClass(@NotNull FqName className) {
|
||||||
@@ -152,7 +145,7 @@ public class ScriptHeaderResolver {
|
|||||||
int index = 0;
|
int index = 0;
|
||||||
List<AnalyzerScriptParameter> scriptParameters = !scriptDefinition.getScriptParameters().isEmpty()
|
List<AnalyzerScriptParameter> scriptParameters = !scriptDefinition.getScriptParameters().isEmpty()
|
||||||
? scriptDefinition.getScriptParameters()
|
? scriptDefinition.getScriptParameters()
|
||||||
: topDownAnalysisParameters.getScriptParameters();
|
: c.getTopDownAnalysisParameters().getScriptParameters();
|
||||||
|
|
||||||
for (AnalyzerScriptParameter scriptParameter : scriptParameters) {
|
for (AnalyzerScriptParameter scriptParameter : scriptParameters) {
|
||||||
ValueParameterDescriptor parameter = resolveScriptParameter(scriptParameter, index, descriptor);
|
ValueParameterDescriptor parameter = resolveScriptParameter(scriptParameter, index, descriptor);
|
||||||
|
|||||||
@@ -230,7 +230,6 @@ public class InjectorForTopDownAnalyzerForJs {
|
|||||||
|
|
||||||
scriptHeaderResolver.setDependencyClassByQualifiedNameResolver(dependencyClassByQualifiedNameResolverDummy);
|
scriptHeaderResolver.setDependencyClassByQualifiedNameResolver(dependencyClassByQualifiedNameResolverDummy);
|
||||||
scriptHeaderResolver.setPackageFragmentProvider(mutablePackageFragmentProvider);
|
scriptHeaderResolver.setPackageFragmentProvider(mutablePackageFragmentProvider);
|
||||||
scriptHeaderResolver.setTopDownAnalysisParameters(topDownAnalysisParameters);
|
|
||||||
scriptHeaderResolver.setTrace(bindingTrace);
|
scriptHeaderResolver.setTrace(bindingTrace);
|
||||||
|
|
||||||
overloadResolver.setTrace(bindingTrace);
|
overloadResolver.setTrace(bindingTrace);
|
||||||
|
|||||||
Reference in New Issue
Block a user