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

Fixed NPE when no type ref is specified in Kotlin signature.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-06-04 18:44:32 +04:00
parent cbd4004d44
commit 968d159f86
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+4 -1
View File
@@ -1675,7 +1675,10 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
if (!signature.isEmpty()) {
JetNamedFunction altFunDeclaration = JetPsiFactory.createFunction(project, signature);
valueParameterDescriptors = computeAlternativeValueParameters(valueParameterDescriptors, altFunDeclaration);
returnType = computeAlternativeTypeFromAnnotation(altFunDeclaration.getReturnTypeRef().getTypeElement(), returnType);
JetTypeReference returnTypeRef = altFunDeclaration.getReturnTypeRef();
if (returnTypeRef != null) {
returnType = computeAlternativeTypeFromAnnotation(returnTypeRef.getTypeElement(), returnType);
}
}
functionDescriptorImpl.initialize(