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
compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java
+2 -3
View File
@@ -16,12 +16,11 @@
package org.jetbrains.kotlin.android.tests; package org.jetbrains.kotlin.android.tests;
import com.google.common.collect.Sets; import java.util.HashSet;
import java.util.Set; import java.util.Set;
public class SpecialFiles { public class SpecialFiles {
private static final Set<String> excludedFiles = Sets.newHashSet(); private static final Set<String> excludedFiles = new HashSet<>();
static { static {
fillExcludedFiles(); fillExcludedFiles();
compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
+1 -1
View File
@@ -127,7 +127,7 @@ public class ExpressionCodegen extends KtVisitor<StackValue, StackValue> impleme
* When we create a temporary variable to hold some value not to compute it many times * When we create a temporary variable to hold some value not to compute it many times
* we put it into this map to emit access to that variable instead of evaluating the whole expression * we put it into this map to emit access to that variable instead of evaluating the whole expression
*/ */
public final Map<KtElement, StackValue> tempVariables = Maps.newHashMap(); public final Map<KtElement, StackValue> tempVariables = new HashMap<>();
private int myLastLineNumber = -1; private int myLastLineNumber = -1;
private boolean shouldMarkLineNumbers = true; private boolean shouldMarkLineNumbers = true;
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicsMap.java
+2 -2
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.codegen.intrinsics; package org.jetbrains.kotlin.codegen.intrinsics;
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.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.*;
@@ -24,6 +23,7 @@ import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.name.FqNameUnsafe; import org.jetbrains.kotlin.name.FqNameUnsafe;
import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.DescriptorUtils;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
class IntrinsicsMap { class IntrinsicsMap {
@@ -74,7 +74,7 @@ class IntrinsicsMap {
} }
} }
private final Map<Key, IntrinsicMethod> intrinsicsMap = Maps.newHashMap(); private final Map<Key, IntrinsicMethod> intrinsicsMap = new HashMap<>();
/** /**
compiler/backend/src/org/jetbrains/kotlin/codegen/when/StringSwitchCodegen.java
+2 -2
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.codegen.when; package org.jetbrains.kotlin.codegen.when;
import com.google.common.collect.Maps;
import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Pair;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.ExpressionCodegen;
@@ -27,6 +26,7 @@ import org.jetbrains.org.objectweb.asm.Label;
import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.Type;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -34,7 +34,7 @@ public class StringSwitchCodegen extends SwitchCodegen {
private static final String HASH_CODE_METHOD_DESC = Type.getMethodDescriptor(Type.INT_TYPE); private static final String HASH_CODE_METHOD_DESC = Type.getMethodDescriptor(Type.INT_TYPE);
private static final String EQUALS_METHOD_DESC = Type.getMethodDescriptor(Type.BOOLEAN_TYPE, Type.getType(Object.class)); private static final String EQUALS_METHOD_DESC = Type.getMethodDescriptor(Type.BOOLEAN_TYPE, Type.getType(Object.class));
private final Map<Integer, List<Pair<String, Label>>> hashCodesToStringAndEntryLabel = Maps.newHashMap(); private final Map<Integer, List<Pair<String, Label>>> hashCodesToStringAndEntryLabel = new HashMap<>();
private int tempVarIndex; private int tempVarIndex;
public StringSwitchCodegen( public StringSwitchCodegen(
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java
+2 -2
View File
@@ -17,7 +17,6 @@
package org.jetbrains.kotlin.cli.jvm.compiler; package org.jetbrains.kotlin.cli.jvm.compiler;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
@@ -50,6 +49,7 @@ import org.jetbrains.kotlin.utils.PathUtil;
import java.io.*; import java.io.*;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.jar.*; import java.util.jar.*;
@@ -147,7 +147,7 @@ public class CompileEnvironmentUtil {
) throws IOException { ) throws IOException {
VirtualFileSystem localFileSystem = VirtualFileManager.getInstance().getFileSystem(StandardFileSystems.FILE_PROTOCOL); VirtualFileSystem localFileSystem = VirtualFileManager.getInstance().getFileSystem(StandardFileSystems.FILE_PROTOCOL);
Set<VirtualFile> processedFiles = Sets.newHashSet(); Set<VirtualFile> processedFiles = new HashSet<>();
List<KtFile> result = Lists.newArrayList(); List<KtFile> result = Lists.newArrayList();
PreprocessedFileCreator virtualFileCreator = new PreprocessedFileCreator(project); PreprocessedFileCreator virtualFileCreator = new PreprocessedFileCreator(project);
compiler/frontend/src/org/jetbrains/kotlin/checkers/DebugInfoUtil.java
+2 -2
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.checkers; package org.jetbrains.kotlin.checkers;
import com.google.common.collect.Maps;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.TokenSet; import com.intellij.psi.tree.TokenSet;
@@ -42,6 +41,7 @@ import org.jetbrains.kotlin.types.KotlinType;
import org.jetbrains.kotlin.util.slicedMap.WritableSlice; import org.jetbrains.kotlin.util.slicedMap.WritableSlice;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import static org.jetbrains.kotlin.lexer.KtTokens.*; import static org.jetbrains.kotlin.lexer.KtTokens.*;
@@ -72,7 +72,7 @@ public class DebugInfoUtil {
@NotNull BindingContext bindingContext, @NotNull BindingContext bindingContext,
@NotNull DebugInfoReporter debugInfoReporter @NotNull DebugInfoReporter debugInfoReporter
) { ) {
Map<KtReferenceExpression, DiagnosticFactory<?>> markedWithErrorElements = Maps.newHashMap(); Map<KtReferenceExpression, DiagnosticFactory<?>> markedWithErrorElements = new HashMap<>();
for (Diagnostic diagnostic : bindingContext.getDiagnostics()) { for (Diagnostic diagnostic : bindingContext.getDiagnostics()) {
DiagnosticFactory<?> factory = diagnostic.getFactory(); DiagnosticFactory<?> factory = diagnostic.getFactory();
if (Errors.UNRESOLVED_REFERENCE_DIAGNOSTICS.contains(diagnostic.getFactory())) { if (Errors.UNRESOLVED_REFERENCE_DIAGNOSTICS.contains(diagnostic.getFactory())) {
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt
+1 -2
View File
@@ -17,7 +17,6 @@
package org.jetbrains.kotlin.diagnostics.rendering package org.jetbrains.kotlin.diagnostics.rendering
import com.google.common.collect.Lists import com.google.common.collect.Lists
import com.google.common.collect.Sets
import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.util.text.StringUtil import com.intellij.openapi.util.text.StringUtil
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
@@ -252,7 +251,7 @@ object Renderers {
for (substitutedDescriptor in substitutedDescriptors) { for (substitutedDescriptor in substitutedDescriptors) {
val receiverType = DescriptorUtils.getReceiverParameterType(substitutedDescriptor.extensionReceiverParameter) val receiverType = DescriptorUtils.getReceiverParameterType(substitutedDescriptor.extensionReceiverParameter)
val errorPositions = Sets.newHashSet<ConstraintPosition>() val errorPositions = hashSetOf<ConstraintPosition>()
val parameterTypes = Lists.newArrayList<KotlinType>() val parameterTypes = Lists.newArrayList<KotlinType>()
for (valueParameterDescriptor in substitutedDescriptor.valueParameters) { for (valueParameterDescriptor in substitutedDescriptor.valueParameters) {
parameterTypes.add(valueParameterDescriptor.type) parameterTypes.add(valueParameterDescriptor.type)
compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java
+4 -5
View File
@@ -17,7 +17,6 @@
package org.jetbrains.kotlin.resolve; package org.jetbrains.kotlin.resolve;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.util.containers.Queue; import com.intellij.util.containers.Queue;
@@ -133,7 +132,7 @@ public class BodyResolver {
resolveSecondaryConstructorBody(c.getOuterDataFlowInfo(), trace, entry.getKey(), entry.getValue(), declaringScope); resolveSecondaryConstructorBody(c.getOuterDataFlowInfo(), trace, entry.getKey(), entry.getValue(), declaringScope);
} }
if (c.getSecondaryConstructors().isEmpty()) return; if (c.getSecondaryConstructors().isEmpty()) return;
Set<ConstructorDescriptor> visitedConstructors = Sets.newHashSet(); Set<ConstructorDescriptor> visitedConstructors = new HashSet<>();
for (Map.Entry<KtSecondaryConstructor, ClassConstructorDescriptor> entry : c.getSecondaryConstructors().entrySet()) { for (Map.Entry<KtSecondaryConstructor, ClassConstructorDescriptor> entry : c.getSecondaryConstructors().entrySet()) {
checkCyclicConstructorDelegationCall(entry.getValue(), visitedConstructors); checkCyclicConstructorDelegationCall(entry.getValue(), visitedConstructors);
} }
@@ -191,7 +190,7 @@ public class BodyResolver {
// if visit constructor that is already in current chain // if visit constructor that is already in current chain
// such constructor is on cycle // such constructor is on cycle
Set<ConstructorDescriptor> visitedInCurrentChain = Sets.newHashSet(); Set<ConstructorDescriptor> visitedInCurrentChain = new HashSet<>();
ConstructorDescriptor currentConstructorDescriptor = constructorDescriptor; ConstructorDescriptor currentConstructorDescriptor = constructorDescriptor;
while (true) { while (true) {
visitedInCurrentChain.add(currentConstructorDescriptor); visitedInCurrentChain.add(currentConstructorDescriptor);
@@ -520,7 +519,7 @@ public class BodyResolver {
@NotNull KtClassOrObject ktClassOrObject @NotNull KtClassOrObject ktClassOrObject
) { ) {
Set<TypeConstructor> allowedFinalSupertypes = getAllowedFinalSupertypes(supertypeOwner, supertypes, ktClassOrObject); Set<TypeConstructor> allowedFinalSupertypes = getAllowedFinalSupertypes(supertypeOwner, supertypes, ktClassOrObject);
Set<TypeConstructor> typeConstructors = Sets.newHashSet(); Set<TypeConstructor> typeConstructors = new HashSet<>();
boolean classAppeared = false; boolean classAppeared = false;
for (Map.Entry<KtTypeReference, KotlinType> entry : supertypes.entrySet()) { for (Map.Entry<KtTypeReference, KotlinType> entry : supertypes.entrySet()) {
KtTypeReference typeReference = entry.getKey(); KtTypeReference typeReference = entry.getKey();
@@ -737,7 +736,7 @@ public class BodyResolver {
private void resolvePropertyDeclarationBodies(@NotNull BodiesResolveContext c) { private void resolvePropertyDeclarationBodies(@NotNull BodiesResolveContext c) {
// Member properties // Member properties
Set<KtProperty> processed = Sets.newHashSet(); Set<KtProperty> processed = new HashSet<>();
for (Map.Entry<KtClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getDeclaredClasses().entrySet()) { for (Map.Entry<KtClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getDeclaredClasses().entrySet()) {
if (!(entry.getKey() instanceof KtClass)) continue; if (!(entry.getKey() instanceof KtClass)) continue;
KtClass ktClass = (KtClass) entry.getKey(); KtClass ktClass = (KtClass) entry.getKey();
compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java
+1 -2
View File
@@ -17,7 +17,6 @@
package org.jetbrains.kotlin.resolve; package org.jetbrains.kotlin.resolve;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import kotlin.Pair; import kotlin.Pair;
@@ -504,7 +503,7 @@ public class DescriptorResolver {
List<UpperBoundCheckRequest> upperBoundCheckRequests = Lists.newArrayList(); List<UpperBoundCheckRequest> upperBoundCheckRequests = Lists.newArrayList();
List<KtTypeParameter> typeParameters = declaration.getTypeParameters(); List<KtTypeParameter> typeParameters = declaration.getTypeParameters();
Map<Name, TypeParameterDescriptorImpl> parameterByName = Maps.newHashMap(); Map<Name, TypeParameterDescriptorImpl> parameterByName = new HashMap<>();
for (int i = 0; i < typeParameters.size(); i++) { for (int i = 0; i < typeParameters.size(); i++) {
KtTypeParameter ktTypeParameter = typeParameters.get(i); KtTypeParameter ktTypeParameter = typeParameters.get(i);
TypeParameterDescriptorImpl typeParameterDescriptor = parameters.get(i); TypeParameterDescriptorImpl typeParameterDescriptor = parameters.get(i);
compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java
+2 -2
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.resolve; package org.jetbrains.kotlin.resolve;
import com.google.common.collect.Maps;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -22,6 +21,7 @@ import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.resolve.checkers.*; import org.jetbrains.kotlin.resolve.checkers.*;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -253,7 +253,7 @@ public class ModifiersChecker {
@NotNull KtModifierList modifierList, @NotNull KtModifierList modifierList,
@NotNull Collection<KtModifierKeywordToken> possibleModifiers @NotNull Collection<KtModifierKeywordToken> possibleModifiers
) { ) {
Map<KtModifierKeywordToken, PsiElement> tokens = Maps.newHashMap(); Map<KtModifierKeywordToken, PsiElement> tokens = new HashMap<>();
for (KtModifierKeywordToken modifier : possibleModifiers) { for (KtModifierKeywordToken modifier : possibleModifiers) {
if (modifierList.hasModifier(modifier)) { if (modifierList.hasModifier(modifier)) {
tokens.put(modifier, modifierList.getModifier(modifier)); tokens.put(modifier, modifierList.getModifier(modifier));
compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.kt
+1 -1
View File
@@ -866,7 +866,7 @@ class OverrideResolver(
declaringClass: ClassDescriptor declaringClass: ClassDescriptor
): CallableMemberDescriptor? { ): CallableMemberDescriptor? {
for (supertype in declaringClass.typeConstructor.supertypes) { for (supertype in declaringClass.typeConstructor.supertypes) {
val all = Sets.newLinkedHashSet<CallableMemberDescriptor>() val all = linkedSetOf<CallableMemberDescriptor>()
all.addAll(supertype.memberScope.getContributedFunctions(declared.name, NoLookupLocation.WHEN_CHECK_OVERRIDES)) all.addAll(supertype.memberScope.getContributedFunctions(declared.name, NoLookupLocation.WHEN_CHECK_OVERRIDES))
all.addAll(supertype.memberScope.getContributedVariables(declared.name, NoLookupLocation.WHEN_CHECK_OVERRIDES)) all.addAll(supertype.memberScope.getContributedVariables(declared.name, NoLookupLocation.WHEN_CHECK_OVERRIDES))
for (fromSuper in all) { for (fromSuper in all) {
compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java
+2 -5
View File
@@ -28,10 +28,7 @@ import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyScriptDescriptor;
import org.jetbrains.kotlin.resolve.scopes.LexicalScope; import org.jetbrains.kotlin.resolve.scopes.LexicalScope;
import java.io.PrintStream; import java.io.PrintStream;
import java.util.Collection; import java.util.*;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
public class TopDownAnalysisContext implements BodiesResolveContext { public class TopDownAnalysisContext implements BodiesResolveContext {
@@ -44,7 +41,7 @@ public class TopDownAnalysisContext implements BodiesResolveContext {
private final Map<KtNamedFunction, SimpleFunctionDescriptor> functions = Maps.newLinkedHashMap(); private final Map<KtNamedFunction, SimpleFunctionDescriptor> functions = Maps.newLinkedHashMap();
private final Map<KtProperty, PropertyDescriptor> properties = Maps.newLinkedHashMap(); private final Map<KtProperty, PropertyDescriptor> properties = Maps.newLinkedHashMap();
private final Map<KtParameter, PropertyDescriptor> primaryConstructorParameterProperties = Maps.newHashMap(); private final Map<KtParameter, PropertyDescriptor> primaryConstructorParameterProperties = new HashMap<>();
private final Map<KtTypeAlias, TypeAliasDescriptor> typeAliases = Maps.newLinkedHashMap(); private final Map<KtTypeAlias, TypeAliasDescriptor> typeAliases = Maps.newLinkedHashMap();
private final Map<KtDestructuringDeclarationEntry, PropertyDescriptor> destructuringDeclarationEntries = Maps.newLinkedHashMap(); private final Map<KtDestructuringDeclarationEntry, PropertyDescriptor> destructuringDeclarationEntries = Maps.newLinkedHashMap();
private Map<KtCallableDeclaration, CallableMemberDescriptor> members = null; private Map<KtCallableDeclaration, CallableMemberDescriptor> members = null;
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ValueArgumentsToParametersMapper.java
+5 -11
View File
@@ -16,8 +16,6 @@
package org.jetbrains.kotlin.resolve.calls; package org.jetbrains.kotlin.resolve.calls;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.intellij.psi.impl.source.tree.LeafPsiElement; import com.intellij.psi.impl.source.tree.LeafPsiElement;
import kotlin.collections.CollectionsKt; import kotlin.collections.CollectionsKt;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -27,7 +25,6 @@ import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.psi.psiUtil.KtPsiUtilKt;
import org.jetbrains.kotlin.psi.psiUtil.ReservedCheckingKt; import org.jetbrains.kotlin.psi.psiUtil.ReservedCheckingKt;
import org.jetbrains.kotlin.resolve.OverrideResolver; import org.jetbrains.kotlin.resolve.OverrideResolver;
import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt;
@@ -35,10 +32,7 @@ import org.jetbrains.kotlin.resolve.calls.components.ArgumentsUtilsKt;
import org.jetbrains.kotlin.resolve.calls.model.*; import org.jetbrains.kotlin.resolve.calls.model.*;
import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy; import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy;
import java.util.Iterator; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Set;
import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.diagnostics.Errors.*;
import static org.jetbrains.kotlin.diagnostics.Errors.BadNamedArgumentsTarget.*; import static org.jetbrains.kotlin.diagnostics.Errors.BadNamedArgumentsTarget.*;
@@ -88,8 +82,8 @@ public class ValueArgumentsToParametersMapper {
private final Map<Name,ValueParameterDescriptor> parameterByName; private final Map<Name,ValueParameterDescriptor> parameterByName;
private Map<Name,ValueParameterDescriptor> parameterByNameInOverriddenMethods; private Map<Name,ValueParameterDescriptor> parameterByNameInOverriddenMethods;
private final Map<ValueParameterDescriptor, VarargValueArgument> varargs = Maps.newHashMap(); private final Map<ValueParameterDescriptor, VarargValueArgument> varargs = new HashMap<>();
private final Set<ValueParameterDescriptor> usedParameters = Sets.newHashSet(); private final Set<ValueParameterDescriptor> usedParameters = new HashSet<>();
private Status status = OK; private Status status = OK;
private Processor(@NotNull Call call, @NotNull MutableResolvedCall<D> candidateCall, @NotNull TracingStrategy tracing) { private Processor(@NotNull Call call, @NotNull MutableResolvedCall<D> candidateCall, @NotNull TracingStrategy tracing) {
@@ -98,7 +92,7 @@ public class ValueArgumentsToParametersMapper {
this.candidateCall = candidateCall; this.candidateCall = candidateCall;
this.parameters = candidateCall.getCandidateDescriptor().getValueParameters(); this.parameters = candidateCall.getCandidateDescriptor().getValueParameters();
this.parameterByName = Maps.newHashMap(); this.parameterByName = new HashMap<>();
for (ValueParameterDescriptor valueParameter : parameters) { for (ValueParameterDescriptor valueParameter : parameters) {
parameterByName.put(valueParameter.getName(), valueParameter); parameterByName.put(valueParameter.getName(), valueParameter);
} }
@@ -107,7 +101,7 @@ public class ValueArgumentsToParametersMapper {
@Nullable @Nullable
private ValueParameterDescriptor getParameterByNameInOverriddenMethods(Name name) { private ValueParameterDescriptor getParameterByNameInOverriddenMethods(Name name) {
if (parameterByNameInOverriddenMethods == null) { if (parameterByNameInOverriddenMethods == null) {
parameterByNameInOverriddenMethods = Maps.newHashMap(); parameterByNameInOverriddenMethods = new HashMap<>();
for (ValueParameterDescriptor valueParameter : parameters) { for (ValueParameterDescriptor valueParameter : parameters) {
for (ValueParameterDescriptor parameterDescriptor : valueParameter.getOverriddenDescriptors()) { for (ValueParameterDescriptor parameterDescriptor : valueParameter.getOverriddenDescriptors()) {
parameterByNameInOverriddenMethods.put(parameterDescriptor.getName(), valueParameter); parameterByNameInOverriddenMethods.put(parameterDescriptor.getName(), valueParameter);
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java
+3 -4
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.resolve.calls.model; package org.jetbrains.kotlin.resolve.calls.model;
import com.google.common.collect.Maps;
import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.diagnostic.Logger;
import com.intellij.util.SmartList; import com.intellij.util.SmartList;
import kotlin.Unit; import kotlin.Unit;
@@ -132,17 +131,17 @@ public class ResolvedCallImpl<D extends CallableDescriptor> implements MutableRe
@NotNull @NotNull
private static Map<ValueParameterDescriptor, ResolvedValueArgument> createValueArgumentsMap(CallableDescriptor descriptor) { private static Map<ValueParameterDescriptor, ResolvedValueArgument> createValueArgumentsMap(CallableDescriptor descriptor) {
return descriptor.getValueParameters().isEmpty() ? Collections.emptyMap() : Maps.newLinkedHashMap(); return descriptor.getValueParameters().isEmpty() ? Collections.emptyMap() : new LinkedHashMap<>();
} }
@NotNull @NotNull
private static Map<ValueArgument, ArgumentMatchImpl> createArgumentsToParameterMap(CallableDescriptor descriptor) { private static Map<ValueArgument, ArgumentMatchImpl> createArgumentsToParameterMap(CallableDescriptor descriptor) {
return descriptor.getValueParameters().isEmpty() ? Collections.emptyMap() : Maps.newHashMap(); return descriptor.getValueParameters().isEmpty() ? Collections.emptyMap() : new HashMap<>();
} }
@NotNull @NotNull
private static Map<TypeParameterDescriptor, KotlinType> createTypeArgumentsMap(CallableDescriptor descriptor) { private static Map<TypeParameterDescriptor, KotlinType> createTypeArgumentsMap(CallableDescriptor descriptor) {
return descriptor.getTypeParameters().isEmpty() ? Collections.emptyMap() : Maps.newLinkedHashMap(); return descriptor.getTypeParameters().isEmpty() ? Collections.emptyMap() : new LinkedHashMap<>();
} }
@Override @Override
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionResultsHandler.java
+6 -7
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.resolve.calls.results; package org.jetbrains.kotlin.resolve.calls.results;
import com.google.common.collect.Sets;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.kotlin.config.LanguageFeature; import org.jetbrains.kotlin.config.LanguageFeature;
@@ -56,10 +55,10 @@ public class ResolutionResultsHandler {
@NotNull Collection<MutableResolvedCall<D>> candidates, @NotNull Collection<MutableResolvedCall<D>> candidates,
@NotNull LanguageVersionSettings languageVersionSettings @NotNull LanguageVersionSettings languageVersionSettings
) { ) {
Set<MutableResolvedCall<D>> successfulCandidates = Sets.newLinkedHashSet(); Set<MutableResolvedCall<D>> successfulCandidates = new LinkedHashSet<>();
Set<MutableResolvedCall<D>> failedCandidates = Sets.newLinkedHashSet(); Set<MutableResolvedCall<D>> failedCandidates = new LinkedHashSet<>();
Set<MutableResolvedCall<D>> incompleteCandidates = Sets.newLinkedHashSet(); Set<MutableResolvedCall<D>> incompleteCandidates = new LinkedHashSet<>();
Set<MutableResolvedCall<D>> candidatesWithWrongReceiver = Sets.newLinkedHashSet(); Set<MutableResolvedCall<D>> candidatesWithWrongReceiver = new LinkedHashSet<>();
for (MutableResolvedCall<D> candidateCall : candidates) { for (MutableResolvedCall<D> candidateCall : candidates) {
ResolutionStatus status = candidateCall.getStatus(); ResolutionStatus status = candidateCall.getStatus();
assert status != UNKNOWN_STATUS : "No resolution for " + candidateCall.getCandidateDescriptor(); assert status != UNKNOWN_STATUS : "No resolution for " + candidateCall.getCandidateDescriptor();
@@ -102,7 +101,7 @@ public class ResolutionResultsHandler {
@NotNull CheckArgumentTypesMode checkArgumentsMode, @NotNull CheckArgumentTypesMode checkArgumentsMode,
@NotNull LanguageVersionSettings languageVersionSettings @NotNull LanguageVersionSettings languageVersionSettings
) { ) {
Set<MutableResolvedCall<D>> successfulAndIncomplete = Sets.newLinkedHashSet(); Set<MutableResolvedCall<D>> successfulAndIncomplete = new LinkedHashSet<>();
successfulAndIncomplete.addAll(successfulCandidates); successfulAndIncomplete.addAll(successfulCandidates);
successfulAndIncomplete.addAll(incompleteCandidates); successfulAndIncomplete.addAll(incompleteCandidates);
OverloadResolutionResultsImpl<D> results = chooseAndReportMaximallySpecific( OverloadResolutionResultsImpl<D> results = chooseAndReportMaximallySpecific(
@@ -148,7 +147,7 @@ public class ResolutionResultsHandler {
} }
for (EnumSet<ResolutionStatus> severityLevel : SEVERITY_LEVELS) { for (EnumSet<ResolutionStatus> severityLevel : SEVERITY_LEVELS) {
Set<MutableResolvedCall<D>> thisLevel = Sets.newLinkedHashSet(); Set<MutableResolvedCall<D>> thisLevel = new LinkedHashSet<>();
for (MutableResolvedCall<D> candidate : failedCandidates) { for (MutableResolvedCall<D> candidate : failedCandidates) {
if (severityLevel.contains(candidate.getStatus())) { if (severityLevel.contains(candidate.getStatus())) {
thisLevel.add(candidate); thisLevel.add(candidate);
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/AbstractTracingStrategy.java
+2 -2
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.resolve.calls.tasks; package org.jetbrains.kotlin.resolve.calls.tasks;
import com.google.common.collect.Sets;
import com.intellij.lang.ASTNode; import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -45,6 +44,7 @@ import org.jetbrains.kotlin.types.Variance;
import org.jetbrains.kotlin.types.expressions.OperatorConventions; import org.jetbrains.kotlin.types.expressions.OperatorConventions;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet;
import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.diagnostics.Errors.*;
import static org.jetbrains.kotlin.resolve.BindingContext.AMBIGUOUS_REFERENCE_TARGET; import static org.jetbrains.kotlin.resolve.BindingContext.AMBIGUOUS_REFERENCE_TARGET;
@@ -64,7 +64,7 @@ public abstract class AbstractTracingStrategy implements TracingStrategy {
@Override @Override
public <D extends CallableDescriptor> void recordAmbiguity(@NotNull BindingTrace trace, @NotNull Collection<? extends ResolvedCall<D>> candidates) { public <D extends CallableDescriptor> void recordAmbiguity(@NotNull BindingTrace trace, @NotNull Collection<? extends ResolvedCall<D>> candidates) {
Collection<D> descriptors = Sets.newHashSet(); Collection<D> descriptors = new HashSet<>();
for (ResolvedCall<D> candidate : candidates) { for (ResolvedCall<D> candidate : candidates) {
descriptors.add(candidate.getCandidateDescriptor()); descriptors.add(candidate.getCandidateDescriptor());
} }
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt
+1 -2
View File
@@ -17,7 +17,6 @@
package org.jetbrains.kotlin.resolve.lazy.declarations package org.jetbrains.kotlin.resolve.lazy.declarations
import com.google.common.collect.ArrayListMultimap import com.google.common.collect.ArrayListMultimap
import com.google.common.collect.Sets
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.safeNameForLazyResolve import org.jetbrains.kotlin.psi.psiUtil.safeNameForLazyResolve
@@ -38,7 +37,7 @@ abstract class AbstractPsiBasedDeclarationProvider(storageManager: StorageManage
val classesAndObjects = ArrayListMultimap.create<Name, KtClassLikeInfo>() // order matters here val classesAndObjects = ArrayListMultimap.create<Name, KtClassLikeInfo>() // order matters here
val typeAliases = ArrayListMultimap.create<Name, KtTypeAlias>() val typeAliases = ArrayListMultimap.create<Name, KtTypeAlias>()
val destructuringDeclarationsEntries = ArrayListMultimap.create<Name, KtDestructuringDeclarationEntry>() val destructuringDeclarationsEntries = ArrayListMultimap.create<Name, KtDestructuringDeclarationEntry>()
val names = Sets.newHashSet<Name>() val names = hashSetOf<Name>()
fun putToIndex(declaration: KtDeclaration) { fun putToIndex(declaration: KtDeclaration) {
if (declaration is KtAnonymousInitializer || declaration is KtSecondaryConstructor) return if (declaration is KtAnonymousInitializer || declaration is KtSecondaryConstructor) return
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java
+2 -2
View File
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.resolve.lazy.declarations;
import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
import kotlin.collections.CollectionsKt; import kotlin.collections.CollectionsKt;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -29,13 +28,14 @@ import org.jetbrains.kotlin.storage.NotNullLazyValue;
import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.kotlin.storage.StorageManager;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet;
import java.util.Set; import java.util.Set;
public class FileBasedDeclarationProviderFactory extends AbstractDeclarationProviderFactory { public class FileBasedDeclarationProviderFactory extends AbstractDeclarationProviderFactory {
private static class Index { private static class Index {
private final Multimap<FqName, KtFile> filesByPackage = LinkedHashMultimap.create(); private final Multimap<FqName, KtFile> filesByPackage = LinkedHashMultimap.create();
private final Set<FqName> declaredPackages = Sets.newHashSet(); private final Set<FqName> declaredPackages = new HashSet<>();
} }
private final StorageManager storageManager; private final StorageManager storageManager;
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt
+2 -3
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.resolve.lazy.descriptors package org.jetbrains.kotlin.resolve.lazy.descriptors
import com.google.common.collect.Sets
import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.incremental.components.LookupLocation import org.jetbrains.kotlin.incremental.components.LookupLocation
import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.lexer.KtTokens
@@ -55,7 +54,7 @@ protected constructor(
storageManager.createMemoizedFunction { doGetTypeAliases(it) } storageManager.createMemoizedFunction { doGetTypeAliases(it) }
private fun doGetClasses(name: Name): List<ClassDescriptor> { private fun doGetClasses(name: Name): List<ClassDescriptor> {
val result = Sets.newLinkedHashSet<ClassDescriptor>() val result = linkedSetOf<ClassDescriptor>()
declarationProvider.getClassOrObjectDeclarations(name).mapTo(result) { declarationProvider.getClassOrObjectDeclarations(name).mapTo(result) {
if (it is KtScriptInfo) if (it is KtScriptInfo)
LazyScriptDescriptor(c as ResolveSession, thisDescriptor, name, it) LazyScriptDescriptor(c as ResolveSession, thisDescriptor, name, it)
@@ -92,7 +91,7 @@ protected constructor(
} }
private fun doGetFunctions(name: Name): Collection<SimpleFunctionDescriptor> { private fun doGetFunctions(name: Name): Collection<SimpleFunctionDescriptor> {
val result = Sets.newLinkedHashSet<SimpleFunctionDescriptor>() val result = linkedSetOf<SimpleFunctionDescriptor>()
val declarations = declarationProvider.getFunctionDeclarations(name) val declarations = declarationProvider.getFunctionDeclarations(name)
for (functionDeclaration in declarations) { for (functionDeclaration in declarations) {
compiler/frontend/src/org/jetbrains/kotlin/types/SubstitutionUtils.java
+3 -3
View File
@@ -17,13 +17,13 @@
package org.jetbrains.kotlin.types; package org.jetbrains.kotlin.types;
import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -36,7 +36,7 @@ public class SubstitutionUtils {
*/ */
@NotNull @NotNull
public static TypeSubstitutor buildDeepSubstitutor(@NotNull KotlinType type) { public static TypeSubstitutor buildDeepSubstitutor(@NotNull KotlinType type) {
Map<TypeConstructor, TypeProjection> substitution = Maps.newHashMap(); Map<TypeConstructor, TypeProjection> substitution = new HashMap<>();
TypeSubstitutor typeSubstitutor = TypeSubstitutor.create(substitution); TypeSubstitutor typeSubstitutor = TypeSubstitutor.create(substitution);
// we use the mutability of the map here // we use the mutability of the map here
fillInDeepSubstitutor(type, typeSubstitutor, substitution, null); fillInDeepSubstitutor(type, typeSubstitutor, substitution, null);
@@ -59,7 +59,7 @@ public class SubstitutionUtils {
@NotNull @NotNull
public static Multimap<TypeParameterDescriptor, TypeProjection> buildDeepSubstitutionMultimap(@NotNull KotlinType type) { public static Multimap<TypeParameterDescriptor, TypeProjection> buildDeepSubstitutionMultimap(@NotNull KotlinType type) {
Multimap<TypeParameterDescriptor, TypeProjection> fullSubstitution = LinkedHashMultimap.create(); Multimap<TypeParameterDescriptor, TypeProjection> fullSubstitution = LinkedHashMultimap.create();
Map<TypeConstructor, TypeProjection> substitution = Maps.newHashMap(); Map<TypeConstructor, TypeProjection> substitution = new HashMap<>();
TypeSubstitutor typeSubstitutor = TypeSubstitutor.create(substitution); TypeSubstitutor typeSubstitutor = TypeSubstitutor.create(substitution);
// we use the mutability of the map here // we use the mutability of the map here
fillInDeepSubstitutor(type, typeSubstitutor, substitution, fullSubstitution); fillInDeepSubstitutor(type, typeSubstitutor, substitution, fullSubstitution);
compiler/frontend/src/org/jetbrains/kotlin/types/TypeUnifier.java
+4 -3
View File
@@ -17,9 +17,10 @@
package org.jetbrains.kotlin.types; package org.jetbrains.kotlin.types;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.utils.CollectionsKt;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@@ -138,8 +139,8 @@ public class TypeUnifier {
private static class UnificationResultImpl implements UnificationResult { private static class UnificationResultImpl implements UnificationResult {
private boolean success = true; private boolean success = true;
private final Map<TypeConstructor, TypeProjection> substitution = Maps.newHashMapWithExpectedSize(1); private final Map<TypeConstructor, TypeProjection> substitution = CollectionsKt.newHashMapWithExpectedSize(1);
private final Set<TypeConstructor> failedVariables = Sets.newHashSetWithExpectedSize(0); private final Set<TypeConstructor> failedVariables = CollectionsKt.newHashSetWithExpectedSize(0);
@Override @Override
public boolean isSuccess() { public boolean isSuccess() {
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java
+2 -3
View File
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.types.expressions;
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 com.intellij.lang.ASTNode; import com.intellij.lang.ASTNode;
import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.Ref;
@@ -233,7 +232,7 @@ public class ControlStructureTypingUtils {
@NotNull DataFlowInfo thenInfo, @NotNull DataFlowInfo thenInfo,
@NotNull DataFlowInfo elseInfo @NotNull DataFlowInfo elseInfo
) { ) {
Map<ValueArgument, DataFlowInfo> dataFlowInfoForArgumentsMap = Maps.newHashMap(); Map<ValueArgument, DataFlowInfo> dataFlowInfoForArgumentsMap = new HashMap<>();
dataFlowInfoForArgumentsMap.put(callForIf.getValueArguments().get(0), thenInfo); dataFlowInfoForArgumentsMap.put(callForIf.getValueArguments().get(0), thenInfo);
dataFlowInfoForArgumentsMap.put(callForIf.getValueArguments().get(1), elseInfo); dataFlowInfoForArgumentsMap.put(callForIf.getValueArguments().get(1), elseInfo);
return createIndependentDataFlowInfoForArgumentsForCall(conditionInfo, dataFlowInfoForArgumentsMap); return createIndependentDataFlowInfoForArgumentsForCall(conditionInfo, dataFlowInfoForArgumentsMap);
@@ -244,7 +243,7 @@ public class ControlStructureTypingUtils {
@NotNull DataFlowInfo subjectDataFlowInfo, @NotNull DataFlowInfo subjectDataFlowInfo,
@NotNull List<DataFlowInfo> entryDataFlowInfos @NotNull List<DataFlowInfo> entryDataFlowInfos
) { ) {
Map<ValueArgument, DataFlowInfo> dataFlowInfoForArgumentsMap = Maps.newHashMap(); Map<ValueArgument, DataFlowInfo> dataFlowInfoForArgumentsMap = new HashMap<>();
int i = 0; int i = 0;
for (ValueArgument argument : callForWhen.getValueArguments()) { for (ValueArgument argument : callForWhen.getValueArguments()) {
DataFlowInfo entryDataFlowInfo = entryDataFlowInfos.get(i++); DataFlowInfo entryDataFlowInfo = entryDataFlowInfos.get(i++);
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java
+2 -2
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.types.expressions; package org.jetbrains.kotlin.types.expressions;
import com.google.common.collect.Sets;
import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.IElementType;
import kotlin.Pair; import kotlin.Pair;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -50,6 +49,7 @@ import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryKt;
import org.jetbrains.kotlin.util.OperatorNameConventions; import org.jetbrains.kotlin.util.OperatorNameConventions;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet;
import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.diagnostics.Errors.*;
import static org.jetbrains.kotlin.psi.KtPsiUtil.deparenthesize; import static org.jetbrains.kotlin.psi.KtPsiUtil.deparenthesize;
@@ -260,7 +260,7 @@ public class ExpressionTypingVisitorForStatements extends ExpressionTypingVisito
// Both 'plus()' and 'plusAssign()' available => ambiguity // Both 'plus()' and 'plusAssign()' available => ambiguity
OverloadResolutionResults<FunctionDescriptor> ambiguityResolutionResults = OverloadResolutionResultsUtil.ambiguity(assignmentOperationDescriptors, binaryOperationDescriptors); OverloadResolutionResults<FunctionDescriptor> ambiguityResolutionResults = OverloadResolutionResultsUtil.ambiguity(assignmentOperationDescriptors, binaryOperationDescriptors);
context.trace.report(ASSIGN_OPERATOR_AMBIGUITY.on(operationSign, ambiguityResolutionResults.getResultingCalls())); context.trace.report(ASSIGN_OPERATOR_AMBIGUITY.on(operationSign, ambiguityResolutionResults.getResultingCalls()));
Collection<DeclarationDescriptor> descriptors = Sets.newHashSet(); Collection<DeclarationDescriptor> descriptors = new HashSet<>();
for (ResolvedCall<?> resolvedCall : ambiguityResolutionResults.getResultingCalls()) { for (ResolvedCall<?> resolvedCall : ambiguityResolutionResults.getResultingCalls()) {
descriptors.add(resolvedCall.getResultingDescriptor()); descriptors.add(resolvedCall.getResultingDescriptor());
} }
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.kt
+1 -2
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.types.expressions package org.jetbrains.kotlin.types.expressions
import com.google.common.collect.Sets
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor
@@ -35,7 +34,7 @@ import org.jetbrains.kotlin.resolve.scopes.utils.getDeclarationsByLabel
object LabelResolver { object LabelResolver {
private fun getElementsByLabelName(labelName: Name, labelExpression: KtSimpleNameExpression): Set<KtElement> { private fun getElementsByLabelName(labelName: Name, labelExpression: KtSimpleNameExpression): Set<KtElement> {
val elements = Sets.newLinkedHashSet<KtElement>() val elements = linkedSetOf<KtElement>()
var parent: PsiElement? = labelExpression.parent var parent: PsiElement? = labelExpression.parent
while (parent != null) { while (parent != null) {
val name = getLabelNameIfAny(parent) val name = getLabelNameIfAny(parent)
compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/MapSupplier.java
+4 -4
View File
@@ -16,8 +16,8 @@
package org.jetbrains.kotlin.util.slicedMap; package org.jetbrains.kotlin.util.slicedMap;
import com.google.common.collect.Maps; import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
public interface MapSupplier { public interface MapSupplier {
@@ -25,14 +25,14 @@ public interface MapSupplier {
MapSupplier HASH_MAP_SUPPLIER = new MapSupplier() { MapSupplier HASH_MAP_SUPPLIER = new MapSupplier() {
@Override @Override
public <K, V> Map<K, V> get() { public <K, V> Map<K, V> get() {
return Maps.newHashMap(); return new HashMap<>();
} }
}; };
MapSupplier LINKED_HASH_MAP_SUPPLIER = new MapSupplier() { MapSupplier LINKED_HASH_MAP_SUPPLIER = new MapSupplier() {
@Override @Override
public <K, V> Map<K, V> get() { public <K, V> Map<K, V> get() {
return Maps.newLinkedHashMap(); return new LinkedHashMap<>();
} }
}; };
compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/TrackingSlicedMap.java
+2 -2
View File
@@ -16,16 +16,16 @@
package org.jetbrains.kotlin.util.slicedMap; package org.jetbrains.kotlin.util.slicedMap;
import com.google.common.collect.Maps;
import kotlin.jvm.functions.Function3; import kotlin.jvm.functions.Function3;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.utils.Printer; import org.jetbrains.kotlin.utils.Printer;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
public class TrackingSlicedMap extends SlicedMapImpl { public class TrackingSlicedMap extends SlicedMapImpl {
private final Map<ReadOnlySlice<?, ?>, SliceWithStackTrace<?, ?>> sliceTranslationMap = Maps.newHashMap(); private final Map<ReadOnlySlice<?, ?>, SliceWithStackTrace<?, ?>> sliceTranslationMap = new HashMap<>();
private final boolean trackWithStackTraces; private final boolean trackWithStackTraces;
public TrackingSlicedMap(boolean trackWithStackTraces) { public TrackingSlicedMap(boolean trackWithStackTraces) {
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IntrinsicsMap.java
+2 -2
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.backend.jvm.intrinsics; package org.jetbrains.kotlin.backend.jvm.intrinsics;
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.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.*;
@@ -24,6 +23,7 @@ import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.name.FqNameUnsafe; import org.jetbrains.kotlin.name.FqNameUnsafe;
import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.DescriptorUtils;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
class IntrinsicsMap { class IntrinsicsMap {
@@ -74,7 +74,7 @@ class IntrinsicsMap {
} }
} }
private final Map<Key, IntrinsicMethod> intrinsicsMap = Maps.newHashMap(); private final Map<Key, IntrinsicMethod> intrinsicsMap = new HashMap<>();
/** /**
compiler/light-classes/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.java
View File
compiler/psi/src/org/jetbrains/kotlin/psi/KtImportsFactory.java
+2 -2
View File
@@ -16,19 +16,19 @@
package org.jetbrains.kotlin.psi; package org.jetbrains.kotlin.psi;
import com.google.common.collect.Maps;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import kotlin.collections.CollectionsKt; import kotlin.collections.CollectionsKt;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.resolve.ImportPath; import org.jetbrains.kotlin.resolve.ImportPath;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
public class KtImportsFactory { public class KtImportsFactory {
@NotNull private final Project project; @NotNull private final Project project;
private final Map<ImportPath, KtImportDirective> importsCache = Maps.newHashMap(); private final Map<ImportPath, KtImportDirective> importsCache = new HashMap<>();
public KtImportsFactory(@NotNull Project project) { public KtImportsFactory(@NotNull Project project) {
this.project = project; this.project = project;
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java
+1 -2
View File
@@ -17,7 +17,6 @@
package org.jetbrains.kotlin.codegen; package org.jetbrains.kotlin.codegen;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
import kotlin.Pair; import kotlin.Pair;
@@ -160,7 +159,7 @@ public abstract class AbstractLineNumberTest extends TestCaseWithTmpdir {
@NotNull @NotNull
private static List<String> readTestFunLineNumbers(@NotNull ClassReader cr) { private static List<String> readTestFunLineNumbers(@NotNull ClassReader cr) {
List<Label> labels = Lists.newArrayList(); List<Label> labels = Lists.newArrayList();
Map<Label, String> labels2LineNumbers = Maps.newHashMap(); Map<Label, String> labels2LineNumbers = new HashMap<>();
ClassVisitor visitor = new ClassVisitor(Opcodes.ASM5) { ClassVisitor visitor = new ClassVisitor(Opcodes.ASM5) {
@Override @Override
compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExpectedResolveData.java
+10 -15
View File
@@ -16,8 +16,6 @@
package org.jetbrains.kotlin.resolve; package org.jetbrains.kotlin.resolve;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiQualifiedNamedElement; import com.intellij.psi.PsiQualifiedNamedElement;
import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiTreeUtil;
@@ -38,10 +36,7 @@ import org.jetbrains.kotlin.types.ErrorUtils;
import org.jetbrains.kotlin.types.KotlinType; import org.jetbrains.kotlin.types.KotlinType;
import org.jetbrains.kotlin.types.TypeConstructor; import org.jetbrains.kotlin.types.TypeConstructor;
import java.util.Arrays; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@@ -70,9 +65,9 @@ public abstract class ExpectedResolveData {
} }
} }
private final Map<String, Position> declarationToPosition = Maps.newHashMap(); private final Map<String, Position> declarationToPosition = new HashMap<>();
private final Map<Position, String> positionToReference = Maps.newHashMap(); private final Map<Position, String> positionToReference = new HashMap<>();
private final Map<Position, String> positionToType = Maps.newHashMap(); private final Map<Position, String> positionToType = new HashMap<>();
private final Map<String, DeclarationDescriptor> nameToDescriptor; private final Map<String, DeclarationDescriptor> nameToDescriptor;
private final Map<String, PsiElement> nameToPsiElement; private final Map<String, PsiElement> nameToPsiElement;
@@ -83,9 +78,9 @@ public abstract class ExpectedResolveData {
} }
public final KtFile createFileFromMarkedUpText(String fileName, String text) { public final KtFile createFileFromMarkedUpText(String fileName, String text) {
Map<String, Integer> declarationToIntPosition = Maps.newHashMap(); Map<String, Integer> declarationToIntPosition = new HashMap<>();
Map<Integer, String> intPositionToReference = Maps.newHashMap(); Map<Integer, String> intPositionToReference = new HashMap<>();
Map<Integer, String> intPositionToType = Maps.newHashMap(); Map<Integer, String> intPositionToType = new HashMap<>();
Pattern pattern = Pattern.compile("(~[^~]+~)|(`[^`]+`)"); Pattern pattern = Pattern.compile("(~[^~]+~)|(`[^`]+`)");
while (true) { while (true) {
@@ -141,16 +136,16 @@ public abstract class ExpectedResolveData {
} }
public final void checkResult(BindingContext bindingContext) { public final void checkResult(BindingContext bindingContext) {
Set<PsiElement> unresolvedReferences = Sets.newHashSet(); Set<PsiElement> unresolvedReferences = new HashSet<>();
for (Diagnostic diagnostic : bindingContext.getDiagnostics()) { for (Diagnostic diagnostic : bindingContext.getDiagnostics()) {
if (Errors.UNRESOLVED_REFERENCE_DIAGNOSTICS.contains(diagnostic.getFactory())) { if (Errors.UNRESOLVED_REFERENCE_DIAGNOSTICS.contains(diagnostic.getFactory())) {
unresolvedReferences.add(diagnostic.getPsiElement()); unresolvedReferences.add(diagnostic.getPsiElement());
} }
} }
Map<String, PsiElement> nameToDeclaration = Maps.newHashMap(); Map<String, PsiElement> nameToDeclaration = new HashMap<>();
Map<PsiElement, String> declarationToName = Maps.newHashMap(); Map<PsiElement, String> declarationToName = new HashMap<>();
for (Map.Entry<String, Position> entry : declarationToPosition.entrySet()) { for (Map.Entry<String, Position> entry : declarationToPosition.entrySet()) {
String name = entry.getKey(); String name = entry.getKey();
Position position = entry.getValue(); Position position = entry.getValue();
compiler/tests-common/tests/org/jetbrains/kotlin/test/InTextDirectivesUtils.java
+1 -2
View File
@@ -6,7 +6,6 @@
package org.jetbrains.kotlin.test; package org.jetbrains.kotlin.test;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.ArrayUtil; import com.intellij.util.ArrayUtil;
@@ -134,7 +133,7 @@ public final class InTextDirectivesUtils {
} }
public static void assertHasUnknownPrefixes(String fileText, Collection<String> knownPrefixes) { public static void assertHasUnknownPrefixes(String fileText, Collection<String> knownPrefixes) {
Set<String> prefixes = Sets.newHashSet(); Set<String> prefixes = new HashSet<>();
for (String line : fileNonEmptyCommentedLines(fileText)) { for (String line : fileNonEmptyCommentedLines(fileText)) {
String prefix = probableDirective(line); String prefix = probableDirective(line);
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
+2 -4
View File
@@ -7,8 +7,6 @@ package org.jetbrains.kotlin.test;
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 com.google.common.collect.Sets;
import com.intellij.openapi.Disposable; import com.intellij.openapi.Disposable;
import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.Editor;
@@ -848,7 +846,7 @@ public class KotlinTestUtils {
@NotNull @NotNull
public static Map<String, String> parseDirectives(String expectedText) { public static Map<String, String> parseDirectives(String expectedText) {
Map<String, String> directives = Maps.newHashMap(); Map<String, String> directives = new HashMap<>();
Matcher directiveMatcher = DIRECTIVE_PATTERN.matcher(expectedText); Matcher directiveMatcher = DIRECTIVE_PATTERN.matcher(expectedText);
int start = 0; int start = 0;
while (directiveMatcher.find()) { while (directiveMatcher.find()) {
@@ -1183,7 +1181,7 @@ public class KotlinTestUtils {
} }
private static Set<String> collectMethodsMetadata(Class<?> testCaseClass) { private static Set<String> collectMethodsMetadata(Class<?> testCaseClass) {
Set<String> filePaths = Sets.newHashSet(); Set<String> filePaths = new HashSet<>();
for (Method method : testCaseClass.getDeclaredMethods()) { for (Method method : testCaseClass.getDeclaredMethods()) {
String path = getMethodMetadata(method); String path = getMethodMetadata(method);
if (path != null) { if (path != null) {
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.173
+2 -4
View File
@@ -7,8 +7,6 @@ package org.jetbrains.kotlin.test;
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 com.google.common.collect.Sets;
import com.intellij.openapi.Disposable; import com.intellij.openapi.Disposable;
import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.Editor;
@@ -848,7 +846,7 @@ public class KotlinTestUtils {
@NotNull @NotNull
public static Map<String, String> parseDirectives(String expectedText) { public static Map<String, String> parseDirectives(String expectedText) {
Map<String, String> directives = Maps.newHashMap(); Map<String, String> directives = new HashMap<>();
Matcher directiveMatcher = DIRECTIVE_PATTERN.matcher(expectedText); Matcher directiveMatcher = DIRECTIVE_PATTERN.matcher(expectedText);
int start = 0; int start = 0;
while (directiveMatcher.find()) { while (directiveMatcher.find()) {
@@ -1183,7 +1181,7 @@ public class KotlinTestUtils {
} }
private static Set<String> collectMethodsMetadata(Class<?> testCaseClass) { private static Set<String> collectMethodsMetadata(Class<?> testCaseClass) {
Set<String> filePaths = Sets.newHashSet(); Set<String> filePaths = new HashSet<>();
for (Method method : testCaseClass.getDeclaredMethods()) { for (Method method : testCaseClass.getDeclaredMethods()) {
String path = getMethodMetadata(method); String path = getMethodMetadata(method);
if (path != null) { if (path != null) {
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31
+2 -4
View File
@@ -7,8 +7,6 @@ package org.jetbrains.kotlin.test;
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 com.google.common.collect.Sets;
import com.intellij.openapi.Disposable; import com.intellij.openapi.Disposable;
import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.Editor;
@@ -848,7 +846,7 @@ public class KotlinTestUtils {
@NotNull @NotNull
public static Map<String, String> parseDirectives(String expectedText) { public static Map<String, String> parseDirectives(String expectedText) {
Map<String, String> directives = Maps.newHashMap(); Map<String, String> directives = new HashMap<>();
Matcher directiveMatcher = DIRECTIVE_PATTERN.matcher(expectedText); Matcher directiveMatcher = DIRECTIVE_PATTERN.matcher(expectedText);
int start = 0; int start = 0;
while (directiveMatcher.find()) { while (directiveMatcher.find()) {
@@ -1183,7 +1181,7 @@ public class KotlinTestUtils {
} }
private static Set<String> collectMethodsMetadata(Class<?> testCaseClass) { private static Set<String> collectMethodsMetadata(Class<?> testCaseClass) {
Set<String> filePaths = Sets.newHashSet(); Set<String> filePaths = new HashSet<>();
for (Method method : testCaseClass.getDeclaredMethods()) { for (Method method : testCaseClass.getDeclaredMethods()) {
String path = getMethodMetadata(method); String path = getMethodMetadata(method);
if (path != null) { if (path != null) {
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32
+2 -4
View File
@@ -7,8 +7,6 @@ package org.jetbrains.kotlin.test;
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 com.google.common.collect.Sets;
import com.intellij.openapi.Disposable; import com.intellij.openapi.Disposable;
import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.Editor;
@@ -848,7 +846,7 @@ public class KotlinTestUtils {
@NotNull @NotNull
public static Map<String, String> parseDirectives(String expectedText) { public static Map<String, String> parseDirectives(String expectedText) {
Map<String, String> directives = Maps.newHashMap(); Map<String, String> directives = new HashMap<>();
Matcher directiveMatcher = DIRECTIVE_PATTERN.matcher(expectedText); Matcher directiveMatcher = DIRECTIVE_PATTERN.matcher(expectedText);
int start = 0; int start = 0;
while (directiveMatcher.find()) { while (directiveMatcher.find()) {
@@ -1183,7 +1181,7 @@ public class KotlinTestUtils {
} }
private static Set<String> collectMethodsMetadata(Class<?> testCaseClass) { private static Set<String> collectMethodsMetadata(Class<?> testCaseClass) {
Set<String> filePaths = Sets.newHashSet(); Set<String> filePaths = new HashSet<>();
for (Method method : testCaseClass.getDeclaredMethods()) { for (Method method : testCaseClass.getDeclaredMethods()) {
String path = getMethodMetadata(method); String path = getMethodMetadata(method);
if (path != null) { if (path != null) {
compiler/tests/org/jetbrains/kotlin/types/KotlinTypeCheckerTest.java
+1 -2
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.types; package org.jetbrains.kotlin.types;
import com.google.common.collect.Sets;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.analyzer.AnalysisResult;
@@ -488,7 +487,7 @@ public class KotlinTypeCheckerTest extends KotlinTestWithEnvironment {
private void assertSupertypes(String typeStr, String... supertypeStrs) { private void assertSupertypes(String typeStr, String... supertypeStrs) {
Set<KotlinType> allSupertypes = TypeUtils.getAllSupertypes(makeType(scopeWithImports, typeStr)); Set<KotlinType> allSupertypes = TypeUtils.getAllSupertypes(makeType(scopeWithImports, typeStr));
Set<KotlinType> expected = Sets.newHashSet(); Set<KotlinType> expected = new HashSet<>();
for (String supertypeStr : supertypeStrs) { for (String supertypeStr : supertypeStrs) {
KotlinType supertype = makeType(scopeWithImports, supertypeStr); KotlinType supertype = makeType(scopeWithImports, supertypeStr);
expected.add(supertype); expected.add(supertype);
compiler/tests/org/jetbrains/kotlin/types/TypeSubstitutorTest.java
+2 -2
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.types; package org.jetbrains.kotlin.types;
import com.google.common.collect.Maps;
import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
@@ -50,6 +49,7 @@ import org.jetbrains.kotlin.tests.di.InjectionKt;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@@ -127,7 +127,7 @@ public class TypeSubstitutorTest extends KotlinTestWithEnvironment {
} }
private Map<TypeConstructor, TypeProjection> stringsToSubstitutionMap(Pair<String, String>[] substitutionStrs) { private Map<TypeConstructor, TypeProjection> stringsToSubstitutionMap(Pair<String, String>[] substitutionStrs) {
Map<TypeConstructor, TypeProjection> map = Maps.newHashMap(); Map<TypeConstructor, TypeProjection> map = new HashMap();
for (Pair<String, String> pair : substitutionStrs) { for (Pair<String, String> pair : substitutionStrs) {
String typeParameterName = pair.first; String typeParameterName = pair.first;
String replacementProjectionString = pair.second; String replacementProjectionString = pair.second;
compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java
+3 -3
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.types; package org.jetbrains.kotlin.types;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import kotlin.Unit; import kotlin.Unit;
import kotlin.collections.CollectionsKt; import kotlin.collections.CollectionsKt;
@@ -42,6 +41,7 @@ import org.jetbrains.kotlin.test.ConfigurationKind;
import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.KotlinTestWithEnvironment; import org.jetbrains.kotlin.test.KotlinTestWithEnvironment;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@@ -163,7 +163,7 @@ public class TypeUnifierTest extends KotlinTestWithEnvironment {
} }
private static Map<String, String> expect(boolean success, String... strs) { private static Map<String, String> expect(boolean success, String... strs) {
Map<String, String> map = Maps.newHashMap(); Map<String, String> map = new HashMap<>();
putResult(map, success); putResult(map, success);
for (int i = 0; i < strs.length; i += 2) { for (int i = 0; i < strs.length; i += 2) {
String key = strs[i]; String key = strs[i];
@@ -180,7 +180,7 @@ public class TypeUnifierTest extends KotlinTestWithEnvironment {
@Nullable @Nullable
private static Map<String, String> toStrings(TypeUnifier.UnificationResult map) { private static Map<String, String> toStrings(TypeUnifier.UnificationResult map) {
Map<String, String> result = Maps.newHashMap(); Map<String, String> result = new HashMap<>();
putResult(result, map.isSuccess()); putResult(result, map.isSuccess());
for (Map.Entry<TypeConstructor, TypeProjection> entry : map.getSubstitution().entrySet()) { for (Map.Entry<TypeConstructor, TypeProjection> entry : map.getSubstitution().entrySet()) {
result.put(entry.getKey().toString(), entry.getValue().toString()); result.put(entry.getKey().toString(), entry.getValue().toString());
idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerTreeStructure.kt
+1 -2
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.idea.hierarchy.calls package org.jetbrains.kotlin.idea.hierarchy.calls
import com.google.common.collect.Maps
import com.intellij.find.findUsages.JavaFindUsagesOptions import com.intellij.find.findUsages.JavaFindUsagesOptions
import com.intellij.ide.hierarchy.HierarchyNodeDescriptor import com.intellij.ide.hierarchy.HierarchyNodeDescriptor
import com.intellij.ide.hierarchy.HierarchyTreeStructure import com.intellij.ide.hierarchy.HierarchyTreeStructure
@@ -118,7 +117,7 @@ class KotlinCallerTreeStructure(
override fun buildChildren(nodeDescriptor: HierarchyNodeDescriptor): Array<Any> { override fun buildChildren(nodeDescriptor: HierarchyNodeDescriptor): Array<Any> {
val element = nodeDescriptor.psiElement as? KtDeclaration ?: return ArrayUtil.EMPTY_OBJECT_ARRAY val element = nodeDescriptor.psiElement as? KtDeclaration ?: return ArrayUtil.EMPTY_OBJECT_ARRAY
val callerToDescriptorMap = Maps.newHashMap<PsiElement, NodeDescriptor<*>>() val callerToDescriptorMap = hashMapOf<PsiElement, NodeDescriptor<*>>()
val descriptor = element.unsafeResolveToDescriptor() val descriptor = element.unsafeResolveToDescriptor()
if (descriptor is CallableMemberDescriptor) { if (descriptor is CallableMemberDescriptor) {
return descriptor.getDeepestSuperDeclarations().flatMap { rootDescriptor -> return descriptor.getDeepestSuperDeclarations().flatMap { rootDescriptor ->
idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java
+2 -6
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.idea.highlighter; package org.jetbrains.kotlin.idea.highlighter;
import com.google.common.collect.Sets;
import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.ContainerUtil;
@@ -45,10 +44,7 @@ import org.jetbrains.kotlin.test.KotlinTestWithEnvironment;
import java.io.File; import java.io.File;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.Collections; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Set;
public abstract class AbstractDiagnosticMessageTest extends KotlinTestWithEnvironment { public abstract class AbstractDiagnosticMessageTest extends KotlinTestWithEnvironment {
private static final String DIAGNOSTICS_NUMBER_DIRECTIVE = "DIAGNOSTICS_NUMBER"; private static final String DIAGNOSTICS_NUMBER_DIRECTIVE = "DIAGNOSTICS_NUMBER";
@@ -153,7 +149,7 @@ public abstract class AbstractDiagnosticMessageTest extends KotlinTestWithEnviro
private Set<DiagnosticFactory<?>> getDiagnosticFactories(Map<String, String> directives) { private Set<DiagnosticFactory<?>> getDiagnosticFactories(Map<String, String> directives) {
String diagnosticsData = directives.get(DIAGNOSTICS_DIRECTIVE); String diagnosticsData = directives.get(DIAGNOSTICS_DIRECTIVE);
assert diagnosticsData != null : DIAGNOSTICS_DIRECTIVE + " should be present."; assert diagnosticsData != null : DIAGNOSTICS_DIRECTIVE + " should be present.";
Set<DiagnosticFactory<?>> diagnosticFactories = Sets.newHashSet(); Set<DiagnosticFactory<?>> diagnosticFactories = new HashSet<>();
String[] diagnostics = diagnosticsData.split(" "); String[] diagnostics = diagnosticsData.split(" ");
for (String diagnosticName : diagnostics) { for (String diagnosticName : diagnostics) {
Object diagnostic = getDiagnostic(diagnosticName); Object diagnostic = getDiagnostic(diagnosticName);
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; package org.jetbrains.kotlin.js.patterns;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import kotlin.collections.CollectionsKt; import kotlin.collections.CollectionsKt;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.kotlin.builtins.PrimitiveType;
import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.name.Name;
import java.util.Arrays; import java.util.*;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.function.Predicate; import java.util.function.Predicate;
public final class NamePredicate implements Predicate<Name> { 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()); public static final NamePredicate LONG = new NamePredicate(PrimitiveType.LONG.getTypeName());
@NotNull @NotNull
private final Set<Name> validNames = Sets.newHashSet(); private final Set<Name> validNames = new HashSet<>();
public NamePredicate(@NotNull String... validNames) { public NamePredicate(@NotNull String... validNames) {
this(Arrays.asList(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; package org.jetbrains.kotlin.js.translate.context;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.containers.hash.LinkedHashMap; import com.intellij.util.containers.hash.LinkedHashMap;
@@ -94,10 +93,10 @@ public final class StaticContext {
private final Generator<JsName> objectInstanceNames = new ObjectInstanceNameGenerator(); private final Generator<JsName> objectInstanceNames = new ObjectInstanceNameGenerator();
@NotNull @NotNull
private final Map<JsScope, JsFunction> scopeToFunction = Maps.newHashMap(); private final Map<JsScope, JsFunction> scopeToFunction = new HashMap<>();
@NotNull @NotNull
private final Map<MemberDescriptor, List<DeclarationDescriptor>> classOrConstructorClosure = Maps.newHashMap(); private final Map<MemberDescriptor, List<DeclarationDescriptor>> classOrConstructorClosure = new HashMap<>();
@NotNull @NotNull
private final Map<ClassDescriptor, List<DeferredCallSite>> deferredCallSites = new HashMap<>(); 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; package org.jetbrains.kotlin.js.translate.context.generator;
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.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
public class Generator<V> { public class Generator<V> {
@NotNull @NotNull
private final Map<DeclarationDescriptor, V> values = Maps.newHashMap(); private final Map<DeclarationDescriptor, V> values = new HashMap<>();
@NotNull @NotNull
private final List<Rule<V>> rules = Lists.newArrayList(); private final List<Rule<V>> rules = Lists.newArrayList();