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

replace assignment with comparison in condition exps (IDEA-173860)

Browse Source
This commit is contained in:
Anna Kozlova
2017-06-06 17:10:57 +03:00
parent 9ef785f34e
commit 02c718aae8
11 changed files with 140 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-analysis-api/src/com/intellij/codeInsight/intention/QuickFixFactory.java
View File

@@ -64,6 +64,8 @@ public abstract class QuickFixFactory {
@NotNull
public abstract LocalQuickFixAndIntentionActionOnPsiElement createImplementMethodsFix(@NotNull PsiElement psiElement);
@NotNull
public abstract LocalQuickFixAndIntentionActionOnPsiElement createAssignmentToComparisonFix(PsiAssignmentExpression expr);
@NotNull
public abstract LocalQuickFixAndIntentionActionOnPsiElement createImplementMethodsFix(@NotNull PsiClass psiElement);
@NotNull
public abstract LocalQuickFixOnPsiElement createMethodThrowsFix(@NotNull PsiMethod method, @NotNull PsiClassType exceptionClass, boolean shouldThrow, boolean showContainingClass);

3
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
View File

@@ -1256,6 +1256,9 @@ public class HighlightUtil extends HighlightUtilBase {
QuickFixAction.registerQuickFixAction(info, QUICK_FIX_FACTORY.createMethodReturnFix(method, PsiType.BOOLEAN, true));
}
}
else if (expr instanceof PsiAssignmentExpression && ((PsiAssignmentExpression)expr).getOperationTokenType() == JavaTokenType.EQ) {
QuickFixAction.registerQuickFixAction(info, QUICK_FIX_FACTORY.createAssignmentToComparisonFix((PsiAssignmentExpression)expr));
}
return info;
}
}

6
java/java-analysis-impl/src/com/intellij/codeInsight/intention/EmptyQuickFixFactory.java
View File

@@ -71,6 +71,12 @@ public class EmptyQuickFixFactory extends QuickFixFactory {
return QuickFixes.EMPTY_FIX;
}
@NotNull
@Override
public LocalQuickFixAndIntentionActionOnPsiElement createAssignmentToComparisonFix(PsiAssignmentExpression expr) {
return QuickFixes.EMPTY_FIX;
}
@NotNull
@Override
public LocalQuickFixAndIntentionActionOnPsiElement createImplementMethodsFix(@NotNull PsiClass psiClass) {

61
java/java-impl/src/com/intellij/codeInsight/intention/impl/ReplaceAssignmentWithComparisonFix.java Normal file
View File

@@ -0,0 +1,61 @@
/*
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.codeInsight.intention.impl;
import com.intellij.codeInspection.LocalQuickFixAndIntentionActionOnPsiElement;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.CodeStyleManager;
import com.siyeh.InspectionGadgetsBundle;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public class ReplaceAssignmentWithComparisonFix extends LocalQuickFixAndIntentionActionOnPsiElement {
public ReplaceAssignmentWithComparisonFix(PsiAssignmentExpression expr) {super(expr);}
@Override
public void invoke(@NotNull Project project,
@NotNull PsiFile file,
@Nullable Editor editor,
@NotNull PsiElement startElement,
@NotNull PsiElement endElement) {
PsiBinaryExpression
comparisonExpr = (PsiBinaryExpression)JavaPsiFacade.getElementFactory(project).createExpressionFromText("a==b", startElement);
PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)startElement;
comparisonExpr.getLOperand().replace(assignmentExpression.getLExpression());
PsiExpression rOperand = comparisonExpr.getROperand();
assert rOperand != null;
PsiExpression rExpression = assignmentExpression.getRExpression();
assert rExpression != null;
rOperand.replace(rExpression);
CodeStyleManager.getInstance(project).reformat(assignmentExpression.replace(comparisonExpr));
}
@NotNull
@Override
public String getText() {
return getFamilyName();
}
@Nls
@NotNull
@Override
public String getFamilyName() {
return InspectionGadgetsBundle.message("assignment.used.as.condition.replace.quickfix");
}
}

7
java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java
View File

@@ -30,6 +30,7 @@ import com.intellij.codeInsight.daemon.quickFix.CreateFieldOrPropertyFix;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.codeInsight.intention.IntentionManager;
import com.intellij.codeInsight.intention.QuickFixFactory;
import com.intellij.codeInsight.intention.impl.ReplaceAssignmentWithComparisonFix;
import com.intellij.codeInspection.*;
import com.intellij.codeInspection.deadCode.UnusedDeclarationInspectionBase;
import com.intellij.codeInspection.ex.EntryPointsManagerBase;
@@ -124,6 +125,12 @@ public class QuickFixFactoryImpl extends QuickFixFactory {
return new ImplementMethodsFix(psiElement);
}
@NotNull
@Override
public LocalQuickFixAndIntentionActionOnPsiElement createAssignmentToComparisonFix(PsiAssignmentExpression expr) {
return new ReplaceAssignmentWithComparisonFix(expr);
}
@NotNull
@Override
public LocalQuickFixOnPsiElement createMethodThrowsFix(@NotNull PsiMethod method,

6
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceAssignmentWithComparison/afterFirst.java Normal file
View File

@@ -0,0 +1,6 @@
// "Replace '=' with '=='" "true"
class Test {
void f(int a) {
if (a == 0) {}
}
}

6
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceAssignmentWithComparison/beforeComplexAssignment.java Normal file
View File

@@ -0,0 +1,6 @@
// "Replace '=' with '=='" "false"
class Test {
void f(int a) {
if (a <caret>+= 0) {}
}
}

6
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceAssignmentWithComparison/beforeFirst.java Normal file
View File

@@ -0,0 +1,6 @@
// "Replace '=' with '=='" "true"
class Test {
void f(int a) {
if (a <caret>= 0) {}
}
}

6
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceAssignmentWithComparison/beforeIncomplete.java Normal file
View File

@@ -0,0 +1,6 @@
// "Replace '=' with '=='" "false"
class Test {
void f(int a) {
if (a <caret>= ) {}
}
}

30
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/ReplaceAssignmentWithComparisonTest.java Normal file
View File

@@ -0,0 +1,30 @@
/*
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.java.codeInsight.daemon.quickFix;
import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase;
public class ReplaceAssignmentWithComparisonTest extends LightQuickFixParameterizedTestCase {
public void test() throws Exception {
doAllTests();
}
@Override
protected String getBasePath() {
return "/codeInsight/daemonCodeAnalyzer/quickFix/replaceAssignmentWithComparison";
}
}

29
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/AssignmentUsedAsConditionInspection.java
View File

@@ -17,7 +17,11 @@ package com.siyeh.ig.assignment;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.PsiAssignmentExpression;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiExpression;
import com.intellij.psi.PsiReferenceExpression;
import com.intellij.psi.util.PsiUtil;
import com.siyeh.InspectionGadgetsBundle;
import com.siyeh.ig.BaseInspection;
import com.siyeh.ig.BaseInspectionVisitor;
@@ -77,29 +81,10 @@ public class AssignmentUsedAsConditionInspection extends BaseInspection {
return;
}
final PsiElement parent = expression.getParent();
final PsiExpression condition;
if (parent instanceof PsiIfStatement) {
final PsiIfStatement ifStatement = (PsiIfStatement)parent;
condition = ifStatement.getCondition();
}
else if (parent instanceof PsiWhileStatement) {
final PsiWhileStatement whileStatement = (PsiWhileStatement)parent;
condition = whileStatement.getCondition();
}
else if (parent instanceof PsiForStatement) {
final PsiForStatement forStatement = (PsiForStatement)parent;
condition = forStatement.getCondition();
}
else if (parent instanceof PsiDoWhileStatement) {
final PsiDoWhileStatement doWhileStatement = (PsiDoWhileStatement)parent;
condition = doWhileStatement.getCondition();
}
else {
if (!PsiUtil.isCondition(expression, parent)) {
return;
}
if (expression.equals(condition)) {
registerError(expression);
}
registerError(expression);
}
}
}