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

teach InitializationUtils about PsiParenthesesExpression, PsiPolyadicExpression and try-with-resouces

Browse Source
This commit is contained in:
Bas Leijdekkers
2012-08-16 12:57:48 +02:00
parent f767512f91
commit 4aa841bd55
2 changed files with 71 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/InitializationUtils.java
+62 -94
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2003-2009 Dave Griffith, Bas Leijdekkers
* Copyright 2003-2012 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.
@@ -21,12 +21,12 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
public class InitializationUtils {
private InitializationUtils() {
}
private InitializationUtils() {}
public static boolean methodAssignsVariableOrFails(
@Nullable PsiMethod method, @NotNull PsiVariable variable) {
@@ -50,16 +50,6 @@ public class InitializationUtils {
strict);
}
public static boolean classInitializerAssignsVariableOrFails(
@Nullable PsiClassInitializer initializer,
@NotNull PsiVariable variable, boolean strict) {
if (initializer == null) {
return false;
}
final PsiCodeBlock body = initializer.getBody();
return blockAssignsVariableOrFails(body, variable, strict);
}
public static boolean blockAssignsVariableOrFails(
@Nullable PsiCodeBlock block, @NotNull PsiVariable variable) {
return blockAssignsVariableOrFails(block, variable, false);
@@ -296,31 +286,34 @@ public class InitializationUtils {
return false;
}
private static boolean tryStatementAssignsVariableOrFails(
@NotNull PsiTryStatement tryStatement, PsiVariable variable,
@NotNull Set<MethodSignature> checkedMethods, boolean strict) {
private static boolean tryStatementAssignsVariableOrFails(@NotNull PsiTryStatement tryStatement, PsiVariable variable,
@NotNull Set<MethodSignature> checkedMethods, boolean strict) {
final PsiResourceList resourceList = tryStatement.getResourceList();
if (resourceList != null) {
final List<PsiResourceVariable> resourceVariables = resourceList.getResourceVariables();
for (PsiResourceVariable resourceVariable : resourceVariables) {
final PsiExpression initializer = resourceVariable.getInitializer();
if (expressionAssignsVariableOrFails(initializer, variable, checkedMethods, strict)) {
return true;
}
}
}
final PsiCodeBlock tryBlock = tryStatement.getTryBlock();
boolean initializedInTryAndCatch =
blockAssignsVariableOrFails(tryBlock, variable,
checkedMethods, strict);
boolean initializedInTryAndCatch = blockAssignsVariableOrFails(tryBlock, variable, checkedMethods, strict);
final PsiCodeBlock[] catchBlocks = tryStatement.getCatchBlocks();
for (final PsiCodeBlock catchBlock : catchBlocks) {
if (strict) {
initializedInTryAndCatch &=
ExceptionUtils.blockThrowsException(catchBlock);
initializedInTryAndCatch &= ExceptionUtils.blockThrowsException(catchBlock);
}
else {
initializedInTryAndCatch &= blockAssignsVariableOrFails(
catchBlock, variable,
checkedMethods, strict);
initializedInTryAndCatch &= blockAssignsVariableOrFails(catchBlock, variable, checkedMethods, strict);
}
}
if (initializedInTryAndCatch) {
return true;
}
final PsiCodeBlock finallyBlock = tryStatement.getFinallyBlock();
return blockAssignsVariableOrFails(finallyBlock, variable,
checkedMethods, strict);
return blockAssignsVariableOrFails(finallyBlock, variable, checkedMethods, strict);
}
private static boolean ifStatementAssignsVariableOrFails(
@@ -409,121 +402,96 @@ public class InitializationUtils {
return false;
}
private static boolean foreachStatementAssignsVariableOrFails(
PsiVariable field, PsiForeachStatement forStatement) {
private static boolean foreachStatementAssignsVariableOrFails(PsiVariable field, PsiForeachStatement forStatement) {
return false;
}
private static boolean expressionAssignsVariableOrFails(
@Nullable PsiExpression expression,
PsiVariable variable,
@NotNull Set<MethodSignature> checkedMethods, boolean strict) {
private static boolean expressionAssignsVariableOrFails(@Nullable PsiExpression expression, PsiVariable variable,
@NotNull Set<MethodSignature> checkedMethods, boolean strict) {
if (expression == null) {
return false;
}
if (expression instanceof PsiThisExpression ||
expression instanceof PsiLiteralExpression ||
expression instanceof PsiSuperExpression ||
expression instanceof PsiClassObjectAccessExpression) {
expression instanceof PsiClassObjectAccessExpression ||
expression instanceof PsiReferenceExpression) {
return false;
}
else if (expression instanceof PsiReferenceExpression) {
return false;
else if (expression instanceof PsiParenthesizedExpression) {
final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)expression;
final PsiExpression unparenthesizedExpression = parenthesizedExpression.getExpression();
return expressionAssignsVariableOrFails(unparenthesizedExpression, variable, checkedMethods, strict);
}
else if (expression instanceof PsiMethodCallExpression) {
final PsiMethodCallExpression methodCallExpression =
(PsiMethodCallExpression)expression;
return methodCallAssignsVariableOrFails(methodCallExpression,
variable, checkedMethods, strict);
final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression;
return methodCallAssignsVariableOrFails(methodCallExpression, variable, checkedMethods, strict);
}
else if (expression instanceof PsiNewExpression) {
final PsiNewExpression newExpression = (PsiNewExpression)expression;
return newExpressionAssignsVariableOrFails(newExpression, variable,
checkedMethods, strict);
return newExpressionAssignsVariableOrFails(newExpression, variable, checkedMethods, strict);
}
else if (expression instanceof PsiArrayInitializerExpression) {
final PsiArrayInitializerExpression array =
(PsiArrayInitializerExpression)expression;
final PsiArrayInitializerExpression array = (PsiArrayInitializerExpression)expression;
final PsiExpression[] initializers = array.getInitializers();
for (final PsiExpression initializer : initializers) {
if (expressionAssignsVariableOrFails(initializer, variable,
checkedMethods, strict)) {
if (expressionAssignsVariableOrFails(initializer, variable, checkedMethods, strict)) {
return true;
}
}
return false;
}
else if (expression instanceof PsiTypeCastExpression) {
final PsiTypeCastExpression typeCast =
(PsiTypeCastExpression)expression;
final PsiTypeCastExpression typeCast = (PsiTypeCastExpression)expression;
final PsiExpression operand = typeCast.getOperand();
return expressionAssignsVariableOrFails(operand, variable,
checkedMethods, strict);
return expressionAssignsVariableOrFails(operand, variable, checkedMethods, strict);
}
else if (expression instanceof PsiArrayAccessExpression) {
final PsiArrayAccessExpression accessExpression =
(PsiArrayAccessExpression)expression;
final PsiExpression arrayExpression =
accessExpression.getArrayExpression();
final PsiExpression indexExpression =
accessExpression.getIndexExpression();
return expressionAssignsVariableOrFails(arrayExpression, variable,
checkedMethods, strict) ||
expressionAssignsVariableOrFails(indexExpression, variable,
checkedMethods, strict);
final PsiArrayAccessExpression accessExpression = (PsiArrayAccessExpression)expression;
final PsiExpression arrayExpression = accessExpression.getArrayExpression();
final PsiExpression indexExpression = accessExpression.getIndexExpression();
return expressionAssignsVariableOrFails(arrayExpression, variable, checkedMethods, strict) ||
expressionAssignsVariableOrFails(indexExpression, variable, checkedMethods, strict);
}
else if (expression instanceof PsiPrefixExpression) {
final PsiPrefixExpression prefixExpression =
(PsiPrefixExpression)expression;
final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)expression;
final PsiExpression operand = prefixExpression.getOperand();
return expressionAssignsVariableOrFails(operand, variable,
checkedMethods, strict);
return expressionAssignsVariableOrFails(operand, variable, checkedMethods, strict);
}
else if (expression instanceof PsiPostfixExpression) {
final PsiPostfixExpression postfixExpression =
(PsiPostfixExpression)expression;
final PsiPostfixExpression postfixExpression = (PsiPostfixExpression)expression;
final PsiExpression operand = postfixExpression.getOperand();
return expressionAssignsVariableOrFails(operand, variable,
checkedMethods, strict);
return expressionAssignsVariableOrFails(operand, variable, checkedMethods, strict);
}
else if (expression instanceof PsiBinaryExpression) {
final PsiBinaryExpression binaryExpression =
(PsiBinaryExpression)expression;
final PsiExpression lhs = binaryExpression.getLOperand();
final PsiExpression rhs = binaryExpression.getROperand();
return expressionAssignsVariableOrFails(lhs, variable,
checkedMethods, strict) ||
expressionAssignsVariableOrFails(rhs, variable,
checkedMethods, strict);
else if (expression instanceof PsiPolyadicExpression) {
final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression;
final PsiExpression[] operands = polyadicExpression.getOperands();
for (PsiExpression operand : operands) {
if (expressionAssignsVariableOrFails(operand, variable, checkedMethods, strict)) {
return true;
}
}
return false;
}
else if (expression instanceof PsiConditionalExpression) {
final PsiConditionalExpression conditional =
(PsiConditionalExpression)expression;
final PsiConditionalExpression conditional = (PsiConditionalExpression)expression;
final PsiExpression condition = conditional.getCondition();
if (expressionAssignsVariableOrFails(condition, variable,
checkedMethods, strict)) {
if (expressionAssignsVariableOrFails(condition, variable, checkedMethods, strict)) {
return true;
}
final PsiExpression thenExpression =
conditional.getThenExpression();
final PsiExpression elseExpression =
conditional.getElseExpression();
return expressionAssignsVariableOrFails(thenExpression, variable,
checkedMethods, strict) &&
expressionAssignsVariableOrFails(elseExpression, variable,
checkedMethods, strict);
final PsiExpression thenExpression = conditional.getThenExpression();
final PsiExpression elseExpression = conditional.getElseExpression();
return expressionAssignsVariableOrFails(thenExpression, variable, checkedMethods, strict) &&
expressionAssignsVariableOrFails(elseExpression, variable, checkedMethods, strict);
}
else if (expression instanceof PsiAssignmentExpression) {
final PsiAssignmentExpression assignment =
(PsiAssignmentExpression)expression;
final PsiAssignmentExpression assignment = (PsiAssignmentExpression)expression;
final PsiExpression lhs = assignment.getLExpression();
if (expressionAssignsVariableOrFails(lhs, variable, checkedMethods,
strict)) {
if (expressionAssignsVariableOrFails(lhs, variable, checkedMethods, strict)) {
return true;
}
final PsiExpression rhs = assignment.getRExpression();
if (expressionAssignsVariableOrFails(rhs, variable, checkedMethods,
strict)) {
if (expressionAssignsVariableOrFails(rhs, variable, checkedMethods, strict)) {
return true;
}
if (lhs instanceof PsiReferenceExpression) {
plugins/InspectionGadgets/test/com/siyeh/igtest/initialization/field/InstanceVariableInitialization.java
+9
View File
@@ -77,4 +77,13 @@ class A {
private String s = t = "";
private String t;
}
class B {
private int i;
B() throws java.io.FileNotFoundException {
try (java.io.FileInputStream in = new java.io.FileInputStream("asdf" + (i = 3) + "asdf")) {
}
}
}