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

Collect overridden descriptors for property accessors to LinkedHashSet

Browse Source
This commit is contained in:
Alexander Udalov
2013-12-05 20:44:35 +04:00
parent 44ad36ef97
commit 68961004a5
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyAccessorDescriptorImpl.java
+2 -1
View File
@@ -129,9 +129,10 @@ public abstract class PropertyAccessorDescriptorImpl extends DeclarationDescript
throw new UnsupportedOperationException("Accessors must be copied by the corresponding property"); throw new UnsupportedOperationException("Accessors must be copied by the corresponding property");
} }
@NotNull
protected Set<PropertyAccessorDescriptor> getOverriddenDescriptors(boolean isGetter) { protected Set<PropertyAccessorDescriptor> getOverriddenDescriptors(boolean isGetter) {
Set<? extends PropertyDescriptor> overriddenProperties = getCorrespondingProperty().getOverriddenDescriptors(); Set<? extends PropertyDescriptor> overriddenProperties = getCorrespondingProperty().getOverriddenDescriptors();
Set<PropertyAccessorDescriptor> overriddenAccessors = Sets.newHashSet(); Set<PropertyAccessorDescriptor> overriddenAccessors = Sets.newLinkedHashSet(); // LinkedHashSet for determinism
for (PropertyDescriptor overriddenProperty : overriddenProperties) { for (PropertyDescriptor overriddenProperty : overriddenProperties) {
PropertyAccessorDescriptor accessorDescriptor = isGetter ? overriddenProperty.getGetter() : overriddenProperty.getSetter(); PropertyAccessorDescriptor accessorDescriptor = isGetter ? overriddenProperty.getGetter() : overriddenProperty.getSetter();
if (accessorDescriptor != null) { if (accessorDescriptor != null) {