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

IG: rename methods to clarify intent

Browse Source
This commit is contained in:
Bas Leijdekkers
2017-06-10 18:52:15 +02:00
parent 09a9a5d446
commit bb854c65e6
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MismatchedArrayReadWriteInspection.java
+14 -14
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.
@@ -90,7 +90,7 @@ public class MismatchedArrayReadWriteInspection extends BaseInspection {
if (!shouldCheckVariable(field, containingClass)) {
return;
}
final ArrayReadWriteVisitor visitor = new ArrayReadWriteVisitor(field, !isSimpleArrayExpression(field.getInitializer()));
final ArrayReadWriteVisitor visitor = new ArrayReadWriteVisitor(field, !isZeroSizeArrayExpression(field.getInitializer()));
containingClass.accept(visitor);
final boolean written = visitor.isWritten();
if (!visitor.isReferenced() || written == visitor.isRead() || UnusedSymbolUtil.isImplicitWrite(field.getProject(), field, null)) {
@@ -106,7 +106,7 @@ public class MismatchedArrayReadWriteInspection extends BaseInspection {
if (!shouldCheckVariable(variable, codeBlock)) {
return;
}
final ArrayReadWriteVisitor visitor = new ArrayReadWriteVisitor(variable, !isSimpleArrayExpression(variable.getInitializer()));
final ArrayReadWriteVisitor visitor = new ArrayReadWriteVisitor(variable, !isZeroSizeArrayExpression(variable.getInitializer()));
codeBlock.accept(visitor);
final boolean written = visitor.isWritten();
if (!visitor.isReferenced() || written == visitor.isRead()) {
@@ -116,10 +116,10 @@ public class MismatchedArrayReadWriteInspection extends BaseInspection {
}
private static boolean shouldCheckVariable(PsiVariable variable, PsiElement context) {
return context != null && variable.getType().getArrayDimensions() != 0 && !isComplexArrayExpression(variable.getInitializer());
return context != null && variable.getType().getArrayDimensions() != 0 && !mayBeAccessedElsewhere(variable.getInitializer());
}
static boolean isComplexArrayExpression(PsiExpression expression) {
static boolean mayBeAccessedElsewhere(PsiExpression expression) {
expression = ParenthesesUtils.stripParentheses(expression);
if (expression == null) {
return false;
@@ -127,12 +127,12 @@ public class MismatchedArrayReadWriteInspection extends BaseInspection {
if (expression instanceof PsiNewExpression) {
final PsiNewExpression newExpression = (PsiNewExpression)expression;
final PsiArrayInitializerExpression arrayInitializer = newExpression.getArrayInitializer();
return isComplexArrayExpression(arrayInitializer);
return mayBeAccessedElsewhere(arrayInitializer);
}
else if (expression instanceof PsiArrayInitializerExpression) {
final PsiArrayInitializerExpression arrayInitializerExpression = (PsiArrayInitializerExpression)expression;
for (PsiExpression initializer : arrayInitializerExpression.getInitializers()) {
if (isComplexArrayExpression(initializer)) {
if (mayBeAccessedElsewhere(initializer)) {
return true;
}
}
@@ -146,12 +146,12 @@ public class MismatchedArrayReadWriteInspection extends BaseInspection {
}
else if (expression instanceof PsiTypeCastExpression) {
final PsiTypeCastExpression typeCastExpression = (PsiTypeCastExpression)expression;
return isComplexArrayExpression(typeCastExpression.getOperand());
return mayBeAccessedElsewhere(typeCastExpression.getOperand());
}
else if (expression instanceof PsiConditionalExpression) {
final PsiConditionalExpression conditionalExpression = (PsiConditionalExpression)expression;
return isComplexArrayExpression(conditionalExpression.getThenExpression()) ||
isComplexArrayExpression(conditionalExpression.getElseExpression());
return mayBeAccessedElsewhere(conditionalExpression.getThenExpression()) ||
mayBeAccessedElsewhere(conditionalExpression.getElseExpression());
}
else if (expression instanceof PsiMethodCallExpression) {
final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression;
@@ -177,14 +177,14 @@ public class MismatchedArrayReadWriteInspection extends BaseInspection {
return true;
}
static boolean isSimpleArrayExpression(PsiExpression initializer) {
static boolean isZeroSizeArrayExpression(PsiExpression initializer) {
if (initializer == null) {
return true;
}
if (initializer instanceof PsiNewExpression) {
final PsiNewExpression newExpression = (PsiNewExpression)initializer;
final PsiArrayInitializerExpression arrayInitializer = newExpression.getArrayInitializer();
return arrayInitializer == null || isSimpleArrayExpression(arrayInitializer);
return arrayInitializer == null || isZeroSizeArrayExpression(arrayInitializer);
}
if (initializer instanceof PsiArrayInitializerExpression) {
final PsiArrayInitializerExpression arrayInitializerExpression = (PsiArrayInitializerExpression)initializer;
@@ -220,11 +220,11 @@ public class MismatchedArrayReadWriteInspection extends BaseInspection {
if (parent instanceof PsiAssignmentExpression) {
final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent;
final PsiExpression rhs = assignmentExpression.getRExpression();
if (isComplexArrayExpression(rhs)) {
if (mayBeAccessedElsewhere(rhs)) {
myWritten = true;
myRead = true;
}
else if (!isSimpleArrayExpression(rhs)) {
else if (!isZeroSizeArrayExpression(rhs)) {
myWritten = true;
}
}