MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 06:39:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

Java: Convert intention "Join Declaration And Assignment" into inspection - minor fixes after review (IDEA-178919)

Browse Source
This commit is contained in:
Pavel Dolgov
2018-10-02 14:48:53 +03:00
parent 0a1bac12c0
commit acbb991ce1
3 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
java/java-impl/src/com/intellij/codeInspection/JoinDeclarationAndAssignmentJavaInspection.java
View File

@@ -7,11 +7,12 @@ import com.intellij.openapi.application.WriteAction;
import com.intellij.openapi.project.Project;
import com.intellij.profile.codeInspection.InspectionProjectProfileManager;
import com.intellij.psi.*;
import com.intellij.psi.search.LocalSearchScope;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.ObjectUtils;
import com.siyeh.ig.psiutils.CommentTracker;
import com.siyeh.ig.psiutils.VariableAccessUtils;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -42,7 +43,9 @@ public class JoinDeclarationAndAssignmentJavaInspection extends AbstractBaseJava
// At the "information" level only bare minimal set of elements are visited when the file is being edited.
// If the caret is at the variable declaration the assignment expression can be not visited so we do the same check here.
if (isOnTheFly) visitLocation(variable);
if (isOnTheFly && isInformationLevel(variable)) {
visitLocation(variable);
}
}
public void visitLocation(@Nullable PsiElement location) {
@@ -55,7 +58,7 @@ public class JoinDeclarationAndAssignmentJavaInspection extends AbstractBaseJava
JoinDeclarationAndAssignmentFix fix = new JoinDeclarationAndAssignmentFix();
ProblemHighlightType highlightType = context.myIsUpdate ? INFORMATION : GENERIC_ERROR_OR_WARNING;
if (isOnTheFly && (context.myIsUpdate || InspectionProjectProfileManager.isInformationLevel(getShortName(), location))) {
if (isOnTheFly && (context.myIsUpdate || isInformationLevel(location))) {
holder.registerProblem(location, message, highlightType, fix);
}
else if (location == assignment) {
@@ -63,35 +66,33 @@ public class JoinDeclarationAndAssignmentJavaInspection extends AbstractBaseJava
}
}
}
private boolean isInformationLevel(@NotNull PsiElement element) {
return InspectionProjectProfileManager.isInformationLevel(getShortName(), element);
}
};
}
@Contract("null -> null")
@Nullable
private static Context getContext(@Nullable PsiElement element) {
if (element != null) {
PsiElement parent = element.getParent();
if (parent != null) {
if (element instanceof PsiAssignmentExpression) {
PsiAssignmentExpression assignment = (PsiAssignmentExpression)element;
return getContext(findVariable(assignment), assignment);
}
if (parent instanceof PsiAssignmentExpression) {
PsiAssignmentExpression assignment = (PsiAssignmentExpression)parent;
return getContext(findVariable(assignment), assignment);
}
if (element instanceof PsiLocalVariable) {
PsiLocalVariable variable = (PsiLocalVariable)element;
return getContext(variable, findAssignment(variable));
}
if (parent instanceof PsiLocalVariable) {
PsiLocalVariable variable = (PsiLocalVariable)parent;
return getContext(variable, findAssignment(variable));
}
if (!(element instanceof PsiAssignmentExpression) && !(element instanceof PsiLocalVariable)) {
element = element.getParent();
}
if (element instanceof PsiAssignmentExpression) {
PsiAssignmentExpression assignment = (PsiAssignmentExpression)element;
return getContext(findVariable(assignment), assignment);
}
if (element instanceof PsiLocalVariable) {
PsiLocalVariable variable = (PsiLocalVariable)element;
return getContext(variable, findAssignment(variable));
}
}
return null;
}
@Contract("null,_ -> null; _,null -> null")
@Nullable
private static Context getContext(@Nullable PsiLocalVariable variable, @Nullable PsiAssignmentExpression assignment) {
if (variable != null && assignment != null) {
@@ -99,7 +100,7 @@ public class JoinDeclarationAndAssignmentJavaInspection extends AbstractBaseJava
PsiExpression rExpression = assignment.getRExpression();
if (variableName != null && rExpression != null) {
for (PsiLocalVariable aVar = variable; aVar != null; aVar = PsiTreeUtil.getNextSiblingOfType(aVar, PsiLocalVariable.class)) {
if (ReferencesSearch.search(aVar, new LocalSearchScope(rExpression), false).findFirst() != null) {
if (VariableAccessUtils.variableIsUsed(aVar, rExpression)) {
return null;
}
}
@@ -111,7 +112,7 @@ public class JoinDeclarationAndAssignmentJavaInspection extends AbstractBaseJava
@Nullable
private static PsiLocalVariable findVariable(@NotNull PsiAssignmentExpression assignmentExpression) {
PsiExpression lExpression = assignmentExpression.getLExpression();
PsiExpression lExpression = PsiUtil.skipParenthesizedExprDown(assignmentExpression.getLExpression());
if (lExpression instanceof PsiReferenceExpression) {
PsiReferenceExpression reference = (PsiReferenceExpression)lExpression;
if (!reference.isQualified()) { // optimization: locals aren't qualified
@@ -135,7 +136,15 @@ public class JoinDeclarationAndAssignmentJavaInspection extends AbstractBaseJava
if (candidate instanceof PsiExpressionStatement) {
PsiExpression expression = ((PsiExpressionStatement)candidate).getExpression();
if (expression instanceof PsiAssignmentExpression) {
return (PsiAssignmentExpression)expression;
PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)expression;
PsiExpression lExpression = PsiUtil.skipParenthesizedExprDown(assignmentExpression.getLExpression());
if (lExpression instanceof PsiReferenceExpression) {
PsiReferenceExpression reference = (PsiReferenceExpression)lExpression;
if (!reference.isQualified() && // optimization: locals aren't qualified
reference.isReferenceTo(variable)) {
return assignmentExpression;
}
}
}
}
return null;

2
java/java-impl/src/inspectionDescriptions/JoinDeclarationAndAssignmentJava.html
View File

@@ -1,5 +1,7 @@
<html>
<body>
Reports variable assignments that can be joined with the variable's declaration.
<!-- tooltip end -->
<p><small>New in 2018.3</small></p>
</body>
</html>

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/joinDeclaration/beforeOtherVariable.java Normal file
View File

@@ -0,0 +1,8 @@
// "Join declaration and assignment" "false"
class C {
void test() {
String t;
String <caret>s;
t = "foo";
}
}