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

Minor: Replace a number of trivial Guava usages with constructor calls and kotlin-stdlib function calls

Browse Source
This commit is contained in:
Yan Zhulanow
2018-06-01 18:03:19 +03:00
parent 61ffde54fd
commit ab5614eaac
44 changed files with 100 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.frontend/src/org/jetbrains/kotlin/js/patterns/NamePredicate.java
+2 -6
View File
@@ -17,16 +17,12 @@
package org.jetbrains.kotlin.js.patterns;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import kotlin.collections.CollectionsKt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.builtins.PrimitiveType;
import org.jetbrains.kotlin.name.Name;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.*;
import java.util.function.Predicate;
public final class NamePredicate implements Predicate<Name> {
@@ -59,7 +55,7 @@ public final class NamePredicate implements Predicate<Name> {
public static final NamePredicate LONG = new NamePredicate(PrimitiveType.LONG.getTypeName());
@NotNull
private final Set<Name> validNames = Sets.newHashSet();
private final Set<Name> validNames = new HashSet<>();
public NamePredicate(@NotNull String... validNames) {
this(Arrays.asList(validNames));
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java
+2 -3
View File
@@ -17,7 +17,6 @@
package org.jetbrains.kotlin.js.translate.context;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.containers.hash.LinkedHashMap;
@@ -94,10 +93,10 @@ public final class StaticContext {
private final Generator<JsName> objectInstanceNames = new ObjectInstanceNameGenerator();
@NotNull
private final Map<JsScope, JsFunction> scopeToFunction = Maps.newHashMap();
private final Map<JsScope, JsFunction> scopeToFunction = new HashMap<>();
@NotNull
private final Map<MemberDescriptor, List<DeclarationDescriptor>> classOrConstructorClosure = Maps.newHashMap();
private final Map<MemberDescriptor, List<DeclarationDescriptor>> classOrConstructorClosure = new HashMap<>();
@NotNull
private final Map<ClassDescriptor, List<DeferredCallSite>> deferredCallSites = new HashMap<>();
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/generator/Generator.java
+2 -2
View File
@@ -17,17 +17,17 @@
package org.jetbrains.kotlin.js.translate.context.generator;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class Generator<V> {
@NotNull
private final Map<DeclarationDescriptor, V> values = Maps.newHashMap();
private final Map<DeclarationDescriptor, V> values = new HashMap<>();
@NotNull
private final List<Rule<V>> rules = Lists.newArrayList();