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

NPE when parameter assigned to the wrong class field

Browse Source
This commit is contained in:
Alexey Kudravtsev
2018-08-14 13:56:16 +03:00
parent 36862ed005
commit d9907dc82f
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/src/com/siyeh/ig/style/BoundedWildcardInspection.java
+10 -8
View File
@@ -218,11 +218,11 @@ public class BoundedWildcardInspection extends AbstractBaseJavaLocalInspectionTo
private static PsiField findFieldAssignedFromMethodParameter(@NotNull PsiParameter methodParameter, @NotNull PsiMethod method) {
PsiCodeBlock methodBody = method.getBody();
if (methodBody == null) return null;
PsiClass containingClass = method.getContainingClass();
Ref<Pair<PsiField, PsiType>> assignedToField = Ref.create();
ReferencesSearch.search(methodParameter, new LocalSearchScope(methodBody)).forEach(ref -> {
ProgressManager.checkCanceled();
Pair<PsiField, PsiType> assigned = isAssignedToField(ref);
Pair<PsiField, PsiType> assigned = isAssignedToField(ref, containingClass);
if (assigned != null) {
if (!assignedToField.isNull() && !assigned.equals(assignedToField.get())) {
assignedToField.set(null);
@@ -433,7 +433,7 @@ public class BoundedWildcardInspection extends AbstractBaseJavaLocalInspectionTo
}
// return field assigned to, type of the expression assigned from
private static Pair<PsiField, PsiType> isAssignedToField(@NotNull PsiReference ref) {
private static Pair<PsiField, PsiType> isAssignedToField(@NotNull PsiReference ref, PsiClass containingClass) {
PsiElement refElement = ref.getElement();
PsiElement parent = skipParensAndCastsUp(refElement);
if (!(parent instanceof PsiAssignmentExpression) || ((PsiAssignmentExpression)parent).getOperationTokenType() != JavaTokenType.EQ) return null;
@@ -444,14 +444,16 @@ public class BoundedWildcardInspection extends AbstractBaseJavaLocalInspectionTo
PsiReferenceExpression lExpression = (PsiReferenceExpression)l;
PsiExpression lQualifier = skipParensAndCastsDown(lExpression.getQualifierExpression());
if (lQualifier != null && !(lQualifier instanceof PsiThisExpression)) return null;
PsiElement field = lExpression.resolve();
PsiElement resolved = lExpression.resolve();
if (!(resolved instanceof PsiField)) return null;
// too expensive to search for usages of public field otherwise
if (!(field instanceof PsiField) ||
!((PsiField)field).hasModifierProperty(PsiModifier.PRIVATE) &&
!((PsiField)field).hasModifierProperty(PsiModifier.PACKAGE_LOCAL)) return null;
PsiField field = (PsiField)resolved;
if (!field.hasModifierProperty(PsiModifier.PRIVATE) &&
!field.hasModifierProperty(PsiModifier.PACKAGE_LOCAL)) return null;
PsiType type = r.getType();
if (type == null) return null;
return Pair.createNonNull((PsiField)field, type);
if (field.getContainingClass() != containingClass) return null;
return Pair.createNonNull(field, type);
}