MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

groovy method's return type shouldn't be null (IDEA-50536)

Browse Source
This commit is contained in:
peter
2010-02-03 16:56:41 +00:00
parent 34853b73e1
commit 17f57e7ad4
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrMethodBaseImpl.java
+6 -1
View File
@@ -156,7 +156,12 @@ public abstract class GrMethodBaseImpl<T extends NamedStub> extends GroovyBaseEl
PsiType nominal = getNominalType(method);
if (nominal != null && nominal.equals(PsiType.VOID)) return nominal;
PsiType inferred = getInferredType(method);
if (nominal == null) return inferred;
if (nominal == null) {
if (inferred == null) {
return PsiType.getJavaLangObject(PsiManager.getInstance(method.getProject()), method.getResolveScope());
}
return inferred;
}
if (inferred != null && inferred != PsiType.NULL) {
if (nominal.isAssignableFrom(inferred)) return inferred;
}
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolvePropertyTest.groovy
+2 -5
View File
@@ -16,10 +16,6 @@
package org.jetbrains.plugins.groovy.lang.resolve;
import com.intellij.psi.PsiClassType
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiMethod
import com.intellij.psi.PsiReference
import com.intellij.psi.util.PropertyUtil
import org.jetbrains.plugins.groovy.GroovyFileType
import org.jetbrains.plugins.groovy.lang.psi.GrReferenceElement
@@ -34,6 +30,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrEn
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod
import org.jetbrains.plugins.groovy.lang.psi.api.toplevel.GrTopStatement
import org.jetbrains.plugins.groovy.util.TestUtils
import com.intellij.psi.*
/**
* @author ven
@@ -154,7 +151,7 @@ public class ResolvePropertyTest extends GroovyResolveTestCase {
PsiReference ref = configureByFile("recursive2/A.groovy");
PsiElement resolved = ref.resolve();
assertTrue(resolved instanceof GrMethod);
assertNull(((GrMethod) resolved).getReturnType());
assertEquals(CommonClassNames.JAVA_LANG_OBJECT, ((GrMethod) resolved).returnType.canonicalText);
}
public void testNotAField() throws Exception {