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

fixed 'getSliceContents'

Browse Source 
do not throw an exception when some slices were overwritten
This commit is contained in:
Svetlana Isakova
2013-12-25 17:37:42 +04:00
committed by Andrey Breslav
parent 217931622e
commit d4c2a542eb
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatingBindingTrace.java
+5 -3
View File
@@ -18,6 +18,7 @@ package org.jetbrains.jet.lang.resolve;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly; import org.jetbrains.annotations.TestOnly;
@@ -62,9 +63,10 @@ public class DelegatingBindingTrace implements BindingTrace {
@TestOnly @TestOnly
@Override @Override
public <K, V> ImmutableMap<K, V> getSliceContents(@NotNull ReadOnlySlice<K, V> slice) { public <K, V> ImmutableMap<K, V> getSliceContents(@NotNull ReadOnlySlice<K, V> slice) {
ImmutableMap<K, V> parentContents = parentContext.getSliceContents(slice); Map<K, V> result = Maps.newHashMap();
ImmutableMap<K, V> currentContents = map.getSliceContents(slice); result.putAll(parentContext.getSliceContents(slice));
return ImmutableMap.<K, V>builder().putAll(parentContents).putAll(currentContents).build(); result.putAll(map.getSliceContents(slice));
return ImmutableMap.copyOf(result);
} }
}; };