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

EquivalenceChecker: more robust expression sorting

Browse Source 
GitOrigin-RevId: 7c2287c2fccd4868e5c17480e9bda49e0317c16f
This commit is contained in:
Tagir Valeev
2020-07-03 17:13:20 +07:00
committed by intellij-monorepo-bot
parent 79e806b35b
commit f3b5023004
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/collapseIntoLoop/afterFold.java
View File

@@ -2,7 +2,7 @@
class X {
public int hashCode() {
int result = super.hashCode();
for (int i : new int[]{field != null ? field.hashCode() : 0, field2 != null ? field2.hashCode() : 0, field3 != null ? field3.hashCode() : 0, field4 != null ? field4.hashCode() : 0, field5 != null ? field5.hashCode() : 0}) {
for (int i : new int[]{field != null ? field.hashCode() : 0, (field2 != null) ? field2.hashCode() : 0, field3 != null ? field3.hashCode() : 0, field4 != null ? field4.hashCode() : 0, field5 != null ? field5.hashCode() : 0}) {
result = 31 * result + (i);
}
return result;

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/collapseIntoLoop/beforeFold.java
View File

@@ -3,7 +3,7 @@ class X {
public int hashCode() {
int result = super.hashCode();
<selection>result = 31 * result + (field != null ? field.hashCode() : 0);
result = 31 * result + (field2 != null ? field2.hashCode() : 0);
result = 31 * result + ((field2 != null) ? field2.hashCode() : 0);
result = 31 * result + (field3 != null ? field3.hashCode() : 0);
result = 31 * result + (field4 != null ? field4.hashCode() : 0);
result = 31 * result + (field5 != null ? field5.hashCode() : 0);</selection>

3
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/EquivalenceChecker.java
View File

@@ -46,7 +46,8 @@ public class EquivalenceChecker {
private static final Comparator<PsiMember> MEMBER_COMPARATOR =
comparing(PsiMember::getName, nullsFirst(naturalOrder())).thenComparing(PsiMember::getText);
private static final Comparator<PsiExpression> EXPRESSION_COMPARATOR =
comparing(expression -> PsiUtil.skipParenthesizedExprDown(expression), nullsFirst(comparing(PsiExpression::getText)));
comparing(expression -> PsiUtil.skipParenthesizedExprDown(expression),
nullsFirst(comparing((PsiExpression expr) -> expr.getClass().getName()).thenComparing(PsiExpression::getText)));
protected EquivalenceChecker() {}