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

NPE on unfinished function declaration fixed

Browse Source
This commit is contained in:
svtk
2011-09-07 13:22:47 +04:00
parent 2f4377d7c0
commit d9137f18cc
2 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java
+8 -5
View File
@@ -406,7 +406,9 @@ public class TopDownAnalyzer {
List<JetAnnotationEntry> annotationEntries = modifierList.getAnnotationEntries(); List<JetAnnotationEntry> annotationEntries = modifierList.getAnnotationEntries();
for (JetAnnotationEntry annotationEntry : annotationEntries) { for (JetAnnotationEntry annotationEntry : annotationEntries) {
AnnotationDescriptor annotationDescriptor = trace.get(ANNOTATION, annotationEntry); AnnotationDescriptor annotationDescriptor = trace.get(ANNOTATION, annotationEntry);
annotationResolver.resolveAnnotationStub(mutableClassDescriptor.getScopeForSupertypeResolution(), annotationEntry, annotationDescriptor); if (annotationDescriptor != null) {
annotationResolver.resolveAnnotationStub(mutableClassDescriptor.getScopeForSupertypeResolution(), annotationEntry, annotationDescriptor);
}
} }
} }
} }
@@ -964,14 +966,15 @@ public class TopDownAnalyzer {
} }
protected void checkFunctionCorrectness(JetNamedFunction function, FunctionDescriptor functionDescriptor, DeclarationDescriptor containingDescriptor) { protected void checkFunctionCorrectness(JetNamedFunction function, FunctionDescriptor functionDescriptor, DeclarationDescriptor containingDescriptor) {
PsiElement nameIdentifier = function.getNameIdentifier();
if (containingDescriptor instanceof ClassDescriptor) { if (containingDescriptor instanceof ClassDescriptor) {
ClassDescriptor classDescriptor = (ClassDescriptor) containingDescriptor; ClassDescriptor classDescriptor = (ClassDescriptor) containingDescriptor;
if (functionDescriptor.getModifiers().isAbstract() && !classDescriptor.isAbstract()) { if (functionDescriptor.getModifiers().isAbstract() && !classDescriptor.isAbstract()) {
trace.getErrorHandler().genericError(function.getModifierList().getModifierNode(JetTokens.ABSTRACT_KEYWORD), trace.getErrorHandler().genericError(function.getModifierList().getModifierNode(JetTokens.ABSTRACT_KEYWORD),
"Abstract method " + function.getName() + " in non-abstract class " + classDescriptor.getName()); "Abstract method " + function.getName() + " in non-abstract class " + classDescriptor.getName());
} }
if (function.getBodyExpression() == null && !functionDescriptor.getModifiers().isAbstract()) { if (function.getBodyExpression() == null && !functionDescriptor.getModifiers().isAbstract() && nameIdentifier != null) {
trace.getErrorHandler().genericError(function.getNameIdentifier().getNode(), "Method without body must be abstract"); trace.getErrorHandler().genericError(nameIdentifier.getNode(), "Method " + function.getName() + " without body must be abstract");
} }
return; return;
} }
@@ -979,8 +982,8 @@ public class TopDownAnalyzer {
trace.getErrorHandler().genericError(function.getModifierList().getModifierNode(JetTokens.ABSTRACT_KEYWORD), trace.getErrorHandler().genericError(function.getModifierList().getModifierNode(JetTokens.ABSTRACT_KEYWORD),
"Global function " + function.getName() + " can not be abstract"); "Global function " + function.getName() + " can not be abstract");
} }
if (function.getBodyExpression() == null && !functionDescriptor.getModifiers().isAbstract()) { if (function.getBodyExpression() == null && !functionDescriptor.getModifiers().isAbstract() && nameIdentifier != null) {
trace.getErrorHandler().genericError(function.getNameIdentifier().getNode(), "Global function must have body"); trace.getErrorHandler().genericError(nameIdentifier.getNode(), "Global function " + function.getName() + " must have body");
} }
} }
idea/testData/checker/FunctionReturnTypes.jet
+16 -15
View File
@@ -115,6 +115,22 @@ fun blockReturnValueTypeMatch() : Int {
fun blockNoReturnIfValDeclaration(): Int { fun blockNoReturnIfValDeclaration(): Int {
<error>val x = 1</error> <error>val x = 1</error>
} }
fun blockNoReturnIfEmptyIf(): Int {
if (1 < 2) <error>{}</error> else <error>{}</error>
}
fun blockNoReturnIfUnitInOneBranch(): Int {
if (1 < 2) {
return 1
} else {
if (3 < 4) <error>{
}</error> else {
return 2
}
}
}
fun nonBlockReturnIfEmptyIf(): Int = if (1 < 2) <error>{}</error> else <error>{}</error>
fun nonBlockNoReturnIfUnitInOneBranch(): Int = if (1 < 2) <error>{}</error> else 2
val a = <error>return 1</error> val a = <error>return 1</error>
class A() { class A() {
@@ -148,18 +164,3 @@ fun f(): Int {
} }
fun f(): Int = if (1 < 2) 1 else returnNothing() fun f(): Int = if (1 < 2) 1 else returnNothing()
fun blockNoReturnIfEmptyIf(): Int {
if (1 < 2) <error>{}</error> else <error>{}</error>
}
fun blockNoReturnIfUnitInOneBranch(): Int {
if (1 < 2) {
return 1
} else {
if (3 < 4) <error>{
}</error> else {
return 21
}
}
}