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

Fix EA-133163 - NPE: EquivalenceChecker.lambda$expressionsAreEquivalent$

Browse Source
This commit is contained in:
Tagir Valeev
2018-12-01 17:43:59 +07:00
parent d3f57c0063
commit 61569c5e12
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/EquivalenceChecker.java
+4 -7
View File
@@ -45,6 +45,8 @@ public class EquivalenceChecker {
private static final EquivalenceChecker ourCanonicalPsiEquivalence = new EquivalenceChecker();
private static final Comparator<PsiMember> MEMBER_COMPARATOR =
comparing(PsiMember::getName, nullsFirst(naturalOrder())).thenComparing(PsiMember::getText);
private static final Comparator<PsiExpression> EXPRESSION_COMPARATOR =
comparing(ParenthesesUtils::stripParentheses, nullsFirst(comparing(PsiExpression::getText)));
protected EquivalenceChecker() {}
@@ -887,11 +889,6 @@ public class EquivalenceChecker {
return codeBlocksMatch(classInitializer1.getBody(), classInitializer2.getBody());
}
private Match methodsMatch(PsiMethod method1, PsiMethod method2) {
if (!methodSignaturesMatch(method1, method2)) return EXACT_MISMATCH;
return codeBlocksMatch(method1.getBody(), method2.getBody());
}
private boolean methodSignaturesMatch(PsiMethod method1, PsiMethod method2) {
if (!method1.getName().equals(method2.getName()) || !typesAreEquivalent(method1.getReturnType(), method2.getReturnType())) {
return false;
@@ -1054,8 +1051,8 @@ public class EquivalenceChecker {
return EXACT_MISMATCH;
}
if (inAnyOrder) {
Arrays.sort(expressions1, comparing(expression -> ParenthesesUtils.stripParentheses(expression).getText()));
Arrays.sort(expressions2, comparing(expression -> ParenthesesUtils.stripParentheses(expression).getText()));
Arrays.sort(expressions1, EXPRESSION_COMPARATOR);
Arrays.sort(expressions2, EXPRESSION_COMPARATOR);
}
Match incompleteMatch = null;
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ParenthesesUtils.java
+1
View File
@@ -92,6 +92,7 @@ public class ParenthesesUtils {
}
@Contract("null -> null")
@Nullable
public static PsiExpression stripParentheses(@Nullable PsiExpression expression) {
while (expression instanceof PsiParenthesizedExpression) {
final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)expression;