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

KT-366 Frontend does not calculates type parameters in ResolvedCall

Browse Source
This commit is contained in:
Andrey Breslav
2011-10-19 11:21:15 +04:00
parent 33d09eb1df
commit 3031db559d
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java
+9
View File
@@ -420,6 +420,9 @@ public class CallResolver {
assert substitute != null; assert substitute != null;
replaceValueParametersWithSubstitutedOnes(candidateCall, substitute); replaceValueParametersWithSubstitutedOnes(candidateCall, substitute);
candidateCall.setResultingDescriptor(substitute); candidateCall.setResultingDescriptor(substitute);
for (TypeParameterDescriptor typeParameterDescriptor : candidateCall.getCandidateDescriptor().getTypeParameters()) {
candidateCall.recordTypeArgument(typeParameterDescriptor, solution.getValue(typeParameterDescriptor));
}
candidateCall.setStatus(SUCCESS); candidateCall.setStatus(SUCCESS);
} }
else { else {
@@ -459,6 +462,12 @@ public class CallResolver {
candidateCall.setResultingDescriptor(substitutedDescriptor); candidateCall.setResultingDescriptor(substitutedDescriptor);
replaceValueParametersWithSubstitutedOnes(candidateCall, substitutedDescriptor); replaceValueParametersWithSubstitutedOnes(candidateCall, substitutedDescriptor);
List<TypeParameterDescriptor> typeParameters = candidateCall.getCandidateDescriptor().getTypeParameters();
for (int i = 0; i < typeParameters.size(); i++) {
TypeParameterDescriptor typeParameterDescriptor = typeParameters.get(i);
candidateCall.recordTypeArgument(typeParameterDescriptor, typeArguments.get(i));
}
candidateCall.setStatus(checkAllValueArguments(scope, tracing, task, candidateCall)); candidateCall.setStatus(checkAllValueArguments(scope, tracing, task, candidateCall));
} }
else { else {