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-96534 (NPE: ImportUtils.hasAccessibleMemberWithName)

Browse Source
This commit is contained in:
Bas Leijdekkers
2017-02-23 17:15:34 +01:00
parent e9b233f3ab
commit b4846ebf5b
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ImportUtils.java
+13 -7
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2003-2016 Dave Griffith, Bas Leijdekkers
* Copyright 2003-2017 Dave Griffith, Bas Leijdekkers
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -79,7 +79,8 @@ public final class ImportUtils {
importList.add(importStatement);
}
private static boolean hasAccessibleMemberWithName(PsiClass containingClass, @NotNull String memberName, @NotNull PsiElement context) {
private static boolean hasAccessibleMemberWithName(@NotNull PsiClass containingClass,
@NotNull String memberName, @NotNull PsiElement context) {
final PsiField field = containingClass.findFieldByName(memberName, true);
if (field != null && PsiUtil.isAccessible(field, context, null)) {
return true;
@@ -365,13 +366,18 @@ public final class ImportUtils {
return false;
}
/**
* @return true, if a static import was created or already present. False, if a static import is not possible.
*/
public static boolean addStaticImport(@NotNull String qualifierClass, @NonNls @NotNull String memberName, @NotNull PsiElement context) {
final PsiClass containingClass = PsiTreeUtil.getParentOfType(context, PsiClass.class);
if (InheritanceUtil.isInheritor(containingClass, qualifierClass)) {
return true;
}
if (hasAccessibleMemberWithName(containingClass, memberName, context)) {
return false;
if (containingClass != null) {
if (InheritanceUtil.isInheritor(containingClass, qualifierClass)) {
return true;
}
if (hasAccessibleMemberWithName(containingClass, memberName, context)) {
return false;
}
}
final PsiFile contextFile = context.getContainingFile();
if (!(contextFile instanceof PsiJavaFile)) {