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

CreateLocalVarFromInstanceofAction: use EquivalenceChecker which is more robust (in particular against parentheses)

Browse Source
This commit is contained in:
Tagir Valeev
2018-07-05 17:58:53 +07:00
parent 79ab032b1b
commit c3778b8706
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalVarFromInstanceofAction.java
View File

@@ -41,6 +41,7 @@ import com.intellij.refactoring.JavaRefactoringSettings;
import com.intellij.refactoring.introduceVariable.IntroduceVariableBase;
import com.intellij.util.ArrayUtil;
import com.intellij.util.IncorrectOperationException;
import com.siyeh.ig.psiutils.EquivalenceChecker;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -105,7 +106,8 @@ public class CreateLocalVarFromInstanceofAction extends BaseIntentionAction {
final PsiTypeCastExpression typeCastExpression = (PsiTypeCastExpression)initializer;
final PsiExpression operand = typeCastExpression.getOperand();
if (operand != null && !PsiEquivalenceUtil.areElementsEquivalent(operand, instanceOfExpression.getOperand())) continue;
if (operand != null &&
!EquivalenceChecker.getCanonicalPsiEquivalence().expressionsAreEquivalent(operand, instanceOfExpression.getOperand())) continue;
PsiTypeElement castTypeElement = typeCastExpression.getCastType();
if (castTypeElement == null) continue;
PsiType castType = castTypeElement.getType();

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/before6p.java Normal file
View File

@@ -0,0 +1,8 @@
// "Insert '(Runnable)this' declaration" "false"
class C {
void f() {
if ((this) instanceof Runnable<caret>) {
Object o = (Runnable)this;
}
}
}