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

encapsulate myIsConstant

Browse Source
This commit is contained in:
Alexey Kudravtsev
2016-06-20 14:21:39 +03:00
parent 4996aefb60
commit 6b63d6bc1f
2 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/psi/util/IsConstantExpressionVisitor.java
+25 -19
View File
@@ -21,57 +21,61 @@ import gnu.trove.THashMap;
import java.util.Map;
import static com.intellij.psi.CommonClassNames.JAVA_LANG_STRING;
public class IsConstantExpressionVisitor extends JavaElementVisitor {
protected boolean myIsConstant;
class IsConstantExpressionVisitor extends JavaElementVisitor {
private boolean myIsConstant;
private final Map<PsiVariable, Boolean> varIsConst = new THashMap<PsiVariable, Boolean>();
public boolean isConstant() {
return myIsConstant;
}
@Override public void visitExpression(PsiExpression expression) {
@Override
public void visitExpression(PsiExpression expression) {
myIsConstant = false;
}
@Override public void visitLiteralExpression(PsiLiteralExpression expression) {
@Override
public void visitLiteralExpression(PsiLiteralExpression expression) {
myIsConstant = !"null".equals(expression.getText());
}
@Override public void visitClassObjectAccessExpression(PsiClassObjectAccessExpression expression) {
@Override
public void visitClassObjectAccessExpression(PsiClassObjectAccessExpression expression) {
myIsConstant = true;
}
@Override public void visitParenthesizedExpression(PsiParenthesizedExpression expression) {
@Override
public void visitParenthesizedExpression(PsiParenthesizedExpression expression) {
PsiExpression expr = expression.getExpression();
if (expr != null){
if (expr != null) {
expr.accept(this);
}
}
@Override public void visitTypeCastExpression(PsiTypeCastExpression expression) {
@Override
public void visitTypeCastExpression(PsiTypeCastExpression expression) {
PsiExpression operand = expression.getOperand();
if (operand == null){
if (operand == null) {
myIsConstant = false;
return;
}
operand.accept(this);
if (!myIsConstant) return;
PsiTypeElement element = expression.getCastType();
if (element == null){
if (element == null) {
myIsConstant = false;
return;
}
PsiType type = element.getType();
if (type instanceof PsiPrimitiveType) return;
if (type.equalsToText(JAVA_LANG_STRING)) return;
if (type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) return;
myIsConstant = false;
}
@Override public void visitPrefixExpression(PsiPrefixExpression expression) {
@Override
public void visitPrefixExpression(PsiPrefixExpression expression) {
PsiExpression operand = expression.getOperand();
if (operand == null){
if (operand == null) {
myIsConstant = false;
return;
}
@@ -90,14 +94,15 @@ public class IsConstantExpressionVisitor extends JavaElementVisitor {
operand.accept(this);
if (!myIsConstant) return;
final PsiType type = operand.getType();
if (type != null && !(type instanceof PsiPrimitiveType) && !type.equalsToText(JAVA_LANG_STRING)) {
if (type != null && !(type instanceof PsiPrimitiveType) && !type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) {
myIsConstant = false;
return;
}
}
}
@Override public void visitConditionalExpression(PsiConditionalExpression expression) {
@Override
public void visitConditionalExpression(PsiConditionalExpression expression) {
PsiExpression thenExpr = expression.getThenExpression();
PsiExpression elseExpr = expression.getElseExpression();
if (thenExpr == null || elseExpr == null) {
@@ -112,7 +117,8 @@ public class IsConstantExpressionVisitor extends JavaElementVisitor {
elseExpr.accept(this);
}
@Override public void visitReferenceExpression(PsiReferenceExpression expression) {
@Override
public void visitReferenceExpression(PsiReferenceExpression expression) {
PsiElement refElement = expression.resolve();
if (!(refElement instanceof PsiVariable)) {
myIsConstant = false;
@@ -140,6 +146,6 @@ public class IsConstantExpressionVisitor extends JavaElementVisitor {
return;
}
initializer.accept(this);
varIsConst.put(variable, Boolean.valueOf(myIsConstant));
varIsConst.put(variable, myIsConstant);
}
}
java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java
+1 -1
View File
@@ -156,7 +156,7 @@ public final class PsiUtil extends PsiUtilCore {
if (expression == null) return false;
IsConstantExpressionVisitor visitor = new IsConstantExpressionVisitor();
expression.accept(visitor);
return visitor.myIsConstant;
return visitor.isConstant();
}
// todo: move to PsiThrowsList?