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

EA-26253 - IOE: PsiJavaParserFacadeImpl.createTypeElementFromText

Browse Source
This commit is contained in:
Maxim Medvedev
2011-04-18 15:31:31 +04:00
parent e4d9382205
commit 5fd448dcf7
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java
+5 -4
View File
@@ -28,7 +28,6 @@ import com.intellij.psi.impl.source.tree.LeafElement;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.SearchScope;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.TokenSet;
import com.intellij.psi.util.InheritanceUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.IncorrectOperationException;
@@ -373,7 +372,7 @@ public class PsiUtil {
return isStaticsOK(owner, place, null);
}
public static boolean isStaticsOK(PsiModifierListOwner owner, PsiElement place, PsiElement resolveContext) {
public static boolean isStaticsOK(PsiModifierListOwner owner, PsiElement place, @Nullable PsiElement resolveContext) {
if (owner instanceof PsiMember) {
if (place instanceof GrReferenceExpression) {
GrExpression qualifier = ((GrReferenceExpression)place).getQualifierExpression();
@@ -626,7 +625,7 @@ public class PsiUtil {
return true;
}
if (expr instanceof GrTupleExpression) return true;
if (expr instanceof GrReferenceExpression || expr instanceof GrIndexProperty || expr instanceof GrPropertySelection) return true;
if (expr instanceof GrReferenceExpression || expr instanceof GrIndexProperty) return true;
if ((expr instanceof GrThisReferenceExpression || expr instanceof GrSuperReferenceExpression) &&
GroovyConfigUtils.getInstance().isVersionAtLeast(expr, GroovyConfigUtils.GROOVY1_8)) {
@@ -1085,7 +1084,9 @@ public class PsiUtil {
public static boolean seemsToBeQualifiedClassName(@Nullable GrExpression qualifier) {
if (qualifier == null) return false;
while (qualifier instanceof GrReferenceExpression) {
if (((GrReferenceExpression)qualifier).getReferenceNameElement() instanceof GrLiteral) return false;
final PsiElement nameElement = ((GrReferenceExpression)qualifier).getReferenceNameElement();
if (((GrReferenceExpression)qualifier).getTypeArguments().length > 0) return false;
if (nameElement == null || nameElement.getNode().getElementType() != GroovyTokenTypes.mIDENT) return false;
qualifier = ((GrReferenceExpression)qualifier).getQualifierExpression();
}
return qualifier == null;