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

EA-36815 Fixed (assert: JetLookupObject.equals)

Browse Source
This commit is contained in:
Nikolay Krasko
2012-07-30 19:10:35 +04:00
parent cb9c18b7ad
commit d9893d9940
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/JetLookupObject.java
+13 -4
View File
@@ -21,6 +21,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.resolve.DescriptorRenderer;
/** /**
* Stores information about resolved descriptor and position of that descriptor. * Stores information about resolved descriptor and position of that descriptor.
@@ -77,10 +78,18 @@ public final class JetLookupObject {
// Same descriptor - same lookup element // Same descriptor - same lookup element
if (descriptor != null && other.descriptor != null) { if (descriptor != null && other.descriptor != null) {
assert context == other.context : "Can't compare descriptors from different binding context"; if (context == other.context) {
if (descriptor.equals(other.descriptor)) {
if (descriptor.equals(other.descriptor)) { return true;
return true; }
}
else {
String descriptorText = DescriptorRenderer.TEXT.render(descriptor);
@SuppressWarnings("ConstantConditions")
String otherDescriptorText = DescriptorRenderer.TEXT.render(other.descriptor);
if (descriptorText.equals(otherDescriptorText)) {
return true;
}
} }
} }