MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 04:51:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-298825: return null when instanceOf is pattern

Browse Source 
GitOrigin-RevId: 15d75dd2c711fc5e506c89e698bccd8e23ffe2e2
This commit is contained in:
Alexandr Suhinin
2022-08-10 15:20:20 +03:00
committed by intellij-monorepo-bot
parent 0c75d9749e
commit 4c4866a669
6 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java
View File

@@ -26,6 +26,7 @@ import com.intellij.structuralsearch.impl.matcher.predicates.RegExpPredicate;
import com.intellij.util.ObjectUtils;
import com.intellij.util.SmartList;
import com.intellij.util.containers.ContainerUtil;
import com.siyeh.ig.psiutils.InstanceOfUtils;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -1593,7 +1594,9 @@ public class JavaMatchingVisitor extends JavaElementVisitor {
final PsiInstanceOfExpression other = getExpression(PsiInstanceOfExpression.class, expression);
if (other == null) return;
if (!myMatchingVisitor.setResult(myMatchingVisitor.match(expression.getOperand(), other.getOperand()))) return;
if (!myMatchingVisitor.setResult(myMatchingVisitor.match(expression.getCheckType(), other.getCheckType()))) return;
PsiTypeElement expressionType = InstanceOfUtils.findCheckTypeElement(expression);
PsiTypeElement otherType = InstanceOfUtils.findCheckTypeElement(other);
if (!myMatchingVisitor.setResult(myMatchingVisitor.match(expressionType, otherType))) return;
final PsiPattern pattern = expression.getPattern();
PsiPattern otherPattern = other.getPattern();
if (pattern instanceof PsiTypeTestPattern) {
@@ -1601,7 +1604,8 @@ public class JavaMatchingVisitor extends JavaElementVisitor {
otherPattern = skipParenthesesDown(otherPattern);
if (otherPattern instanceof PsiTypeTestPattern) {
final PsiTypeTestPattern otherVariable = (PsiTypeTestPattern)otherPattern;
myMatchingVisitor.setResult(myMatchingVisitor.matchOptionally(typeTestPattern.getPatternVariable(), otherVariable.getPatternVariable()));
myMatchingVisitor.setResult(
myMatchingVisitor.matchOptionally(typeTestPattern.getPatternVariable(), otherVariable.getPatternVariable()));
}
else {
myMatchingVisitor.setResult(myMatchingVisitor.allowsAbsenceOfMatch(typeTestPattern.getPatternVariable()));