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

IDEA-26350 (Bad Java code is green: variable might not have been initialized)

Browse Source
This commit is contained in:
Bas Leijdekkers
2013-09-11 16:18:45 +02:00
parent 7ec8c9ee2d
commit 8d7f95a137
3 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java
+15 -3
View File
@@ -380,6 +380,10 @@ public class HighlightControlFlowUtil {
HighlightInfo highlightInfo =
HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(expression).descriptionAndTooltip(description).create();
QuickFixAction.registerQuickFixAction(highlightInfo, QUICK_FIX_FACTORY.createAddVariableInitializerFix(variable));
if (variable instanceof PsiField) {
QuickFixAction.registerQuickFixAction(highlightInfo,
QUICK_FIX_FACTORY.createModifierListFix(variable, PsiModifier.FINAL, false, false));
}
return highlightInfo;
}
@@ -546,11 +550,14 @@ public class HighlightControlFlowUtil {
@Nullable
public static HighlightInfo checkCannotWriteToFinal(PsiExpression expression, @NotNull PsiFile containingFile) {
PsiReferenceExpression reference = null;
boolean readBeforeWrite = false;
if (expression instanceof PsiAssignmentExpression) {
final PsiExpression left = PsiUtil.skipParenthesizedExprDown(((PsiAssignmentExpression)expression).getLExpression());
final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)expression;
final PsiExpression left = PsiUtil.skipParenthesizedExprDown(assignmentExpression.getLExpression());
if (left instanceof PsiReferenceExpression) {
reference = (PsiReferenceExpression)left;
}
readBeforeWrite = assignmentExpression.getOperationTokenType() != JavaTokenType.EQ;
}
else if (expression instanceof PsiPostfixExpression) {
final PsiExpression operand = PsiUtil.skipParenthesizedExprDown(((PsiPostfixExpression)expression).getOperand());
@@ -558,6 +565,7 @@ public class HighlightControlFlowUtil {
if (operand instanceof PsiReferenceExpression && (sign == JavaTokenType.PLUSPLUS || sign == JavaTokenType.MINUSMINUS)) {
reference = (PsiReferenceExpression)operand;
}
readBeforeWrite = true;
}
else if (expression instanceof PsiPrefixExpression) {
final PsiExpression operand = PsiUtil.skipParenthesizedExprDown(((PsiPrefixExpression)expression).getOperand());
@@ -565,13 +573,17 @@ public class HighlightControlFlowUtil {
if (operand instanceof PsiReferenceExpression && (sign == JavaTokenType.PLUSPLUS || sign == JavaTokenType.MINUSMINUS)) {
reference = (PsiReferenceExpression)operand;
}
readBeforeWrite = true;
}
final PsiElement resolved = reference == null ? null : reference.resolve();
PsiVariable variable = resolved instanceof PsiVariable ? (PsiVariable)resolved : null;
if (variable == null || !variable.hasModifierProperty(PsiModifier.FINAL)) return null;
if (!canWriteToFinal(variable, expression, reference, containingFile)) {
final boolean canWrite = canWriteToFinal(variable, expression, reference, containingFile);
if (readBeforeWrite || !canWrite) {
final String name = variable.getName();
String description = JavaErrorMessages.message("assignment.to.final.variable", name);
String description = canWrite ?
JavaErrorMessages.message("variable.not.initialized", name) :
JavaErrorMessages.message("assignment.to.final.variable", name);
final HighlightInfo highlightInfo =
HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(reference.getTextRange()).descriptionAndTooltip(description).create();
final PsiClass innerClass = getInnerClassVariableReferencedFrom(variable, expression);
java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowAnalyzer.java
+2 -2
View File
@@ -1504,7 +1504,7 @@ class ControlFlowAnalyzer extends JavaElementVisitor {
startElement(expression);
IElementType op = expression.getOperationTokenType();
PsiExpression operand = expression.getOperand();
PsiExpression operand = PsiUtil.skipParenthesizedExprDown(expression.getOperand());
operand.accept(this);
if (op == JavaTokenType.PLUSPLUS || op == JavaTokenType.MINUSMINUS) {
if (operand instanceof PsiReferenceExpression) {
@@ -1521,7 +1521,7 @@ class ControlFlowAnalyzer extends JavaElementVisitor {
@Override public void visitPrefixExpression(PsiPrefixExpression expression) {
startElement(expression);
PsiExpression operand = expression.getOperand();
PsiExpression operand = PsiUtil.skipParenthesizedExprDown(expression.getOperand());
if (operand != null) {
IElementType operationSign = expression.getOperationTokenType();
if (operationSign == JavaTokenType.EXCL) {
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/AssignToFinal.java
+12
View File
@@ -80,3 +80,15 @@ class Foo {
}
}
}
class T1 {
private final int i1;
private final int i2;
private final int i3;
private final int i4;
{
(<error descr="Variable 'i1' might not have been initialized">i1</error>)++;
++(<error descr="Variable 'i2' might not have been initialized">i2</error>);
<error descr="Variable 'i3' might not have been initialized">i3</error> += 1;
(i4) = 1;
}
}