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

generate equals/hashCode: sort primitive fields up and leave natural ordering (IDEA-21339)

Browse Source
This commit is contained in:
Anna Kozlova committed 2015-01-13 16:18:27 +01:00
1 parent 22ceca17df
commit cd2d451fba
13 files changed
+47 -49
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHelper.java
+2 -4
View File
@@ -24,6 +24,7 @@ import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.util.MethodSignature;
import com.intellij.psi.util.MethodSignatureUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.HashMap;
@@ -237,10 +238,7 @@ public class GenerateEqualsHelper implements Runnable {
public int compare(PsiField f1, PsiField f2) {
if (f1.getType() instanceof PsiPrimitiveType && !(f2.getType() instanceof PsiPrimitiveType)) return -1;
if (!(f1.getType() instanceof PsiPrimitiveType) && f2.getType() instanceof PsiPrimitiveType) return 1;
final String name1 = f1.getName();
final String name2 = f2.getName();
assert name1 != null && name2 != null;
return name1.compareTo(name2);
return PsiUtilCore.compareElementsByPosition(f1, f2);
}
}