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

Minor. Extract method

Browse Source
This commit is contained in:
Andrey Breslav
2014-03-27 18:25:28 +04:00
parent f81bf5ea73
commit e683a28689
1 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java
+31 -19
View File
@@ -129,28 +129,40 @@ public class ScriptHeaderResolver {
for (Map.Entry<JetScript, ScriptDescriptor> e : c.getScripts().entrySet()) { for (Map.Entry<JetScript, ScriptDescriptor> e : c.getScripts().entrySet()) {
JetScript declaration = e.getKey(); JetScript declaration = e.getKey();
ScriptDescriptorImpl descriptor = (ScriptDescriptorImpl) e.getValue(); ScriptDescriptorImpl descriptor = (ScriptDescriptorImpl) e.getValue();
WritableScope scope = descriptor.getScopeForBodyResolution();
List<ValueParameterDescriptor> valueParameters = Lists.newArrayList(); List<ValueParameterDescriptor> valueParameters = resolveScriptParameters(c, declaration, descriptor);
scope.setImplicitReceiver(descriptor.getThisAsReceiverParameter());
JetFile file = (JetFile) declaration.getContainingFile();
JetScriptDefinition scriptDefinition = JetScriptDefinitionProvider.getInstance(file.getProject()).findScriptDefinition(file);
int index = 0;
List<AnalyzerScriptParameter> scriptParameters = !scriptDefinition.getScriptParameters().isEmpty()
? scriptDefinition.getScriptParameters()
: c.getTopDownAnalysisParameters().getScriptParameters();
for (AnalyzerScriptParameter scriptParameter : scriptParameters) {
ValueParameterDescriptor parameter = resolveScriptParameter(scriptParameter, index, descriptor);
valueParameters.add(parameter);
scope.addVariableDescriptor(parameter);
++index;
}
descriptor.setValueParameters(valueParameters); descriptor.setValueParameters(valueParameters);
WritableScope scope = descriptor.getScopeForBodyResolution();
scope.setImplicitReceiver(descriptor.getThisAsReceiverParameter());
for (ValueParameterDescriptor valueParameterDescriptor : valueParameters) {
scope.addVariableDescriptor(valueParameterDescriptor);
}
} }
} }
@NotNull
public List<ValueParameterDescriptor> resolveScriptParameters(
@NotNull TopDownAnalysisContext c,
@NotNull JetScript declaration,
@NotNull ScriptDescriptor scriptDescriptor
) {
List<ValueParameterDescriptor> valueParameters = Lists.newArrayList();
JetFile file = (JetFile) declaration.getContainingFile();
JetScriptDefinition scriptDefinition = JetScriptDefinitionProvider.getInstance(file.getProject()).findScriptDefinition(file);
int index = 0;
List<AnalyzerScriptParameter> scriptParameters = !scriptDefinition.getScriptParameters().isEmpty()
? scriptDefinition.getScriptParameters()
: c.getTopDownAnalysisParameters().getScriptParameters();
for (AnalyzerScriptParameter scriptParameter : scriptParameters) {
ValueParameterDescriptor parameter = resolveScriptParameter(scriptParameter, index, scriptDescriptor);
valueParameters.add(parameter);
++index;
}
return valueParameters;
}
} }