add single static import: allow second single static import if it doesn't produce ambiguity or hiding of on-demand import (IDEA-155031)

This commit is contained in:
Anna Kozlova
2016-06-07 10:57:34 +03:00
parent c83341f731
commit 9132043620
9 changed files with 114 additions and 11 deletions
@@ -1235,6 +1235,11 @@ public final class PsiUtil extends PsiUtilCore {
return className + "." + member.getName();
}
public static boolean isFromDefaultPackage(PsiClass aClass) {
final PsiFile containingFile = aClass.getContainingFile();
return containingFile instanceof PsiClassOwner && StringUtil.isEmpty(((PsiClassOwner)containingFile).getPackageName());
}
static boolean checkSameExpression(PsiElement templateExpr, final PsiExpression expression) {
return templateExpr.equals(skipParenthesizedExprDown(expression));
}