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

Using signature propagation only if function is owned by class.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-11-30 20:35:36 +04:00
parent f220024308
commit aef96e93cf
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
+13 -7
View File
@@ -142,15 +142,21 @@ public final class JavaFunctionResolver {
final List<String> signatureErrors = Lists.newArrayList();
SignaturesPropagationData signaturesPropagationData =
new SignaturesPropagationData(returnType, valueParameterDescriptors, methodTypeParameters, method, trace);
List<FunctionDescriptor> superFunctions = signaturesPropagationData.getSuperFunctions();
List<FunctionDescriptor> superFunctions;
if (ownerDescriptor instanceof ClassDescriptor) {
SignaturesPropagationData signaturesPropagationData =
new SignaturesPropagationData(returnType, valueParameterDescriptors, methodTypeParameters, method, trace);
superFunctions = signaturesPropagationData.getSuperFunctions();
returnType = signaturesPropagationData.getModifiedReturnType();
valueParameterDescriptors = signaturesPropagationData.getModifiedValueParameters();
methodTypeParameters = signaturesPropagationData.getModifiedTypeParameters();
returnType = signaturesPropagationData.getModifiedReturnType();
valueParameterDescriptors = signaturesPropagationData.getModifiedValueParameters();
methodTypeParameters = signaturesPropagationData.getModifiedTypeParameters();
signatureErrors.addAll(signaturesPropagationData.getSignatureErrors());
signatureErrors.addAll(signaturesPropagationData.getSignatureErrors());
}
else {
superFunctions = Collections.emptyList();
}
// TODO consider better place for this check
AlternativeMethodSignatureData alternativeMethodSignatureData =