azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Attempt to simplify hashCode and equals login in JetLookupObject

Browse Source
This commit is contained in:
Nikolay Krasko
2013-09-18 14:33:09 +04:00
parent 3e94246c45
commit 2975198b4c
1 changed files with 14 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/JetLookupObject.java
+14 -33
View File
@@ -58,50 +58,31 @@ public final class JetLookupObject {
@Override
public String toString() {
return super.toString() + " " +
descriptor + " " +
psiElement;
return super.toString() + " " + descriptor + " " + psiElement;
}
@Override
public int hashCode() {
// Always check with equals
return 0;
int result = descriptor != null ? descriptor.hashCode() : 0;
result = 31 * result + (psiElement != null ? psiElement.hashCode() : 0);
return result;
}
@Override
public boolean equals(Object obj) {
if (obj == null || obj.getClass() != getClass()) {
if (this == obj) return true;
if (obj == null || getClass() != obj.getClass()) return false;
JetLookupObject lookupObject = (JetLookupObject) obj;
if (!analyzer.equals(lookupObject.analyzer)) {
LOG.warn("Descriptors from different resolve sessions");
return false;
}
JetLookupObject other = (JetLookupObject)obj;
if (descriptor != null ? !descriptor.equals(lookupObject.descriptor) : lookupObject.descriptor != null) return false;
if (psiElement != null ? !psiElement.equals(lookupObject.psiElement) : lookupObject.psiElement != null) return false;
// Same descriptor - same lookup element
if (descriptor != null && other.descriptor != null) {
if (analyzer == other.analyzer) {
if (descriptor.equals(other.descriptor)) {
return true;
}
}
else {
LOG.warn("Descriptors from different resolve sessions");
String descriptorText = DescriptorRenderer.TEXT.render(descriptor);
@SuppressWarnings("ConstantConditions")
String otherDescriptorText = DescriptorRenderer.TEXT.render(other.descriptor);
if (descriptorText.equals(otherDescriptorText)) {
return true;
}
}
}
if (psiElement != null && psiElement.equals(other.psiElement)) {
LOG.warn("Different descriptors for same psi elements");
return true;
}
return (descriptor == null && other.descriptor == null &&
psiElement == null && other.psiElement == null);
return true;
}
}