From ab5614eaacb7620e96a1dab3ee5dd2aa82b22a7c Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Fri, 1 Jun 2018 18:03:19 +0300 Subject: [PATCH] Minor: Replace a number of trivial Guava usages with constructor calls and kotlin-stdlib function calls --- .../kotlin/android/tests/SpecialFiles.java | 5 ++-- .../kotlin/codegen/ExpressionCodegen.java | 2 +- .../codegen/intrinsics/IntrinsicsMap.java | 4 +-- .../codegen/when/StringSwitchCodegen.java | 4 +-- .../jvm/compiler/CompileEnvironmentUtil.java | 4 +-- .../kotlin/checkers/DebugInfoUtil.java | 4 +-- .../kotlin/diagnostics/rendering/Renderers.kt | 3 +-- .../kotlin/resolve/BodyResolver.java | 9 +++---- .../kotlin/resolve/DescriptorResolver.java | 3 +-- .../kotlin/resolve/ModifiersChecker.java | 4 +-- .../kotlin/resolve/OverrideResolver.kt | 2 +- .../resolve/TopDownAnalysisContext.java | 7 ++---- .../ValueArgumentsToParametersMapper.java | 16 ++++-------- .../resolve/calls/model/ResolvedCallImpl.java | 7 +++--- .../results/ResolutionResultsHandler.java | 13 +++++----- .../calls/tasks/AbstractTracingStrategy.java | 4 +-- .../AbstractPsiBasedDeclarationProvider.kt | 3 +-- .../FileBasedDeclarationProviderFactory.java | 4 +-- .../descriptors/AbstractLazyMemberScope.kt | 5 ++-- .../kotlin/types/SubstitutionUtils.java | 6 ++--- .../jetbrains/kotlin/types/TypeUnifier.java | 7 +++--- .../ControlStructureTypingUtils.java | 5 ++-- .../ExpressionTypingVisitorForStatements.java | 4 +-- .../kotlin/types/expressions/LabelResolver.kt | 3 +-- .../kotlin/util/slicedMap/MapSupplier.java | 8 +++--- .../util/slicedMap/TrackingSlicedMap.java | 4 +-- .../backend/jvm/intrinsics/IntrinsicsMap.java | 4 +-- .../asJava/finder/JavaElementFinder.java | 0 .../kotlin/psi/KtImportsFactory.java | 4 +-- .../codegen/AbstractLineNumberTest.java | 3 +-- .../kotlin/resolve/ExpectedResolveData.java | 25 ++++++++----------- .../kotlin/test/InTextDirectivesUtils.java | 3 +-- .../kotlin/test/KotlinTestUtils.java | 6 ++--- .../kotlin/test/KotlinTestUtils.java.173 | 6 ++--- .../kotlin/test/KotlinTestUtils.java.as31 | 6 ++--- .../kotlin/test/KotlinTestUtils.java.as32 | 6 ++--- .../kotlin/types/KotlinTypeCheckerTest.java | 3 +-- .../kotlin/types/TypeSubstitutorTest.java | 4 +-- .../kotlin/types/TypeUnifierTest.java | 6 ++--- .../calls/KotlinCallerTreeStructure.kt | 3 +-- .../AbstractDiagnosticMessageTest.java | 8 ++---- .../kotlin/js/patterns/NamePredicate.java | 8 ++---- .../js/translate/context/StaticContext.java | 5 ++-- .../context/generator/Generator.java | 4 +-- 44 files changed, 100 insertions(+), 144 deletions(-) create mode 100644 compiler/light-classes/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.java diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java index 7f8b58d0a18..6fab72bdf14 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java @@ -16,12 +16,11 @@ package org.jetbrains.kotlin.android.tests; -import com.google.common.collect.Sets; - +import java.util.HashSet; import java.util.Set; public class SpecialFiles { - private static final Set excludedFiles = Sets.newHashSet(); + private static final Set excludedFiles = new HashSet<>(); static { fillExcludedFiles(); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java index a59f5a854db..8d1f405d148 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java @@ -127,7 +127,7 @@ public class ExpressionCodegen extends KtVisitor impleme * 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 */ - public final Map tempVariables = Maps.newHashMap(); + public final Map tempVariables = new HashMap<>(); private int myLastLineNumber = -1; private boolean shouldMarkLineNumbers = true; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicsMap.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicsMap.java index 2af69d27292..d949e9ffe73 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicsMap.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicsMap.java @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.codegen.intrinsics; -import com.google.common.collect.Maps; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; 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.resolve.DescriptorUtils; +import java.util.HashMap; import java.util.Map; class IntrinsicsMap { @@ -74,7 +74,7 @@ class IntrinsicsMap { } } - private final Map intrinsicsMap = Maps.newHashMap(); + private final Map intrinsicsMap = new HashMap<>(); /** diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/StringSwitchCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/StringSwitchCodegen.java index 62cb7383d5a..4c1f03502b0 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/StringSwitchCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/StringSwitchCodegen.java @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.codegen.when; -import com.google.common.collect.Maps; import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; 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 java.util.ArrayList; +import java.util.HashMap; import java.util.List; 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 EQUALS_METHOD_DESC = Type.getMethodDescriptor(Type.BOOLEAN_TYPE, Type.getType(Object.class)); - private final Map>> hashCodesToStringAndEntryLabel = Maps.newHashMap(); + private final Map>> hashCodesToStringAndEntryLabel = new HashMap<>(); private int tempVarIndex; public StringSwitchCodegen( diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java index 22a23cd1117..7df13cf18c7 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.cli.jvm.compiler; import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.io.FileUtil; @@ -50,6 +49,7 @@ import org.jetbrains.kotlin.utils.PathUtil; import java.io.*; import java.util.Collection; +import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.jar.*; @@ -147,7 +147,7 @@ public class CompileEnvironmentUtil { ) throws IOException { VirtualFileSystem localFileSystem = VirtualFileManager.getInstance().getFileSystem(StandardFileSystems.FILE_PROTOCOL); - Set processedFiles = Sets.newHashSet(); + Set processedFiles = new HashSet<>(); List result = Lists.newArrayList(); PreprocessedFileCreator virtualFileCreator = new PreprocessedFileCreator(project); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/checkers/DebugInfoUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/checkers/DebugInfoUtil.java index a32f76c77f4..b4d8518a532 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/checkers/DebugInfoUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/checkers/DebugInfoUtil.java @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.checkers; -import com.google.common.collect.Maps; import com.intellij.psi.PsiElement; import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.TokenSet; @@ -42,6 +41,7 @@ import org.jetbrains.kotlin.types.KotlinType; import org.jetbrains.kotlin.util.slicedMap.WritableSlice; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import static org.jetbrains.kotlin.lexer.KtTokens.*; @@ -72,7 +72,7 @@ public class DebugInfoUtil { @NotNull BindingContext bindingContext, @NotNull DebugInfoReporter debugInfoReporter ) { - Map> markedWithErrorElements = Maps.newHashMap(); + Map> markedWithErrorElements = new HashMap<>(); for (Diagnostic diagnostic : bindingContext.getDiagnostics()) { DiagnosticFactory factory = diagnostic.getFactory(); if (Errors.UNRESOLVED_REFERENCE_DIAGNOSTICS.contains(diagnostic.getFactory())) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt index 908a0dfa169..4c5d8cc134c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.diagnostics.rendering import com.google.common.collect.Lists -import com.google.common.collect.Sets import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.util.text.StringUtil import com.intellij.psi.PsiElement @@ -252,7 +251,7 @@ object Renderers { for (substitutedDescriptor in substitutedDescriptors) { val receiverType = DescriptorUtils.getReceiverParameterType(substitutedDescriptor.extensionReceiverParameter) - val errorPositions = Sets.newHashSet() + val errorPositions = hashSetOf() val parameterTypes = Lists.newArrayList() for (valueParameterDescriptor in substitutedDescriptor.valueParameters) { parameterTypes.add(valueParameterDescriptor.type) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java index 39ffdb75c9d..579e0e95d89 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.resolve; import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.containers.Queue; @@ -133,7 +132,7 @@ public class BodyResolver { resolveSecondaryConstructorBody(c.getOuterDataFlowInfo(), trace, entry.getKey(), entry.getValue(), declaringScope); } if (c.getSecondaryConstructors().isEmpty()) return; - Set visitedConstructors = Sets.newHashSet(); + Set visitedConstructors = new HashSet<>(); for (Map.Entry entry : c.getSecondaryConstructors().entrySet()) { checkCyclicConstructorDelegationCall(entry.getValue(), visitedConstructors); } @@ -191,7 +190,7 @@ public class BodyResolver { // if visit constructor that is already in current chain // such constructor is on cycle - Set visitedInCurrentChain = Sets.newHashSet(); + Set visitedInCurrentChain = new HashSet<>(); ConstructorDescriptor currentConstructorDescriptor = constructorDescriptor; while (true) { visitedInCurrentChain.add(currentConstructorDescriptor); @@ -520,7 +519,7 @@ public class BodyResolver { @NotNull KtClassOrObject ktClassOrObject ) { Set allowedFinalSupertypes = getAllowedFinalSupertypes(supertypeOwner, supertypes, ktClassOrObject); - Set typeConstructors = Sets.newHashSet(); + Set typeConstructors = new HashSet<>(); boolean classAppeared = false; for (Map.Entry entry : supertypes.entrySet()) { KtTypeReference typeReference = entry.getKey(); @@ -737,7 +736,7 @@ public class BodyResolver { private void resolvePropertyDeclarationBodies(@NotNull BodiesResolveContext c) { // Member properties - Set processed = Sets.newHashSet(); + Set processed = new HashSet<>(); for (Map.Entry entry : c.getDeclaredClasses().entrySet()) { if (!(entry.getKey() instanceof KtClass)) continue; KtClass ktClass = (KtClass) entry.getKey(); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java index 7a4a39a9656..69f594dfe94 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.resolve; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import kotlin.Pair; @@ -504,7 +503,7 @@ public class DescriptorResolver { List upperBoundCheckRequests = Lists.newArrayList(); List typeParameters = declaration.getTypeParameters(); - Map parameterByName = Maps.newHashMap(); + Map parameterByName = new HashMap<>(); for (int i = 0; i < typeParameters.size(); i++) { KtTypeParameter ktTypeParameter = typeParameters.get(i); TypeParameterDescriptorImpl typeParameterDescriptor = parameters.get(i); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java index 998462c391b..1949e1c79d0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.resolve; -import com.google.common.collect.Maps; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -22,6 +21,7 @@ import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.checkers.*; import java.util.Collection; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -253,7 +253,7 @@ public class ModifiersChecker { @NotNull KtModifierList modifierList, @NotNull Collection possibleModifiers ) { - Map tokens = Maps.newHashMap(); + Map tokens = new HashMap<>(); for (KtModifierKeywordToken modifier : possibleModifiers) { if (modifierList.hasModifier(modifier)) { tokens.put(modifier, modifierList.getModifier(modifier)); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.kt index e3d2941730a..75437bb91d0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.kt @@ -866,7 +866,7 @@ class OverrideResolver( declaringClass: ClassDescriptor ): CallableMemberDescriptor? { for (supertype in declaringClass.typeConstructor.supertypes) { - val all = Sets.newLinkedHashSet() + val all = linkedSetOf() all.addAll(supertype.memberScope.getContributedFunctions(declared.name, NoLookupLocation.WHEN_CHECK_OVERRIDES)) all.addAll(supertype.memberScope.getContributedVariables(declared.name, NoLookupLocation.WHEN_CHECK_OVERRIDES)) for (fromSuper in all) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java index eef5f7419be..41b13810719 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java @@ -28,10 +28,7 @@ import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyScriptDescriptor; import org.jetbrains.kotlin.resolve.scopes.LexicalScope; import java.io.PrintStream; -import java.util.Collection; -import java.util.LinkedHashSet; -import java.util.Map; -import java.util.Set; +import java.util.*; public class TopDownAnalysisContext implements BodiesResolveContext { @@ -44,7 +41,7 @@ public class TopDownAnalysisContext implements BodiesResolveContext { private final Map functions = Maps.newLinkedHashMap(); private final Map properties = Maps.newLinkedHashMap(); - private final Map primaryConstructorParameterProperties = Maps.newHashMap(); + private final Map primaryConstructorParameterProperties = new HashMap<>(); private final Map typeAliases = Maps.newLinkedHashMap(); private final Map destructuringDeclarationEntries = Maps.newLinkedHashMap(); private Map members = null; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ValueArgumentsToParametersMapper.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ValueArgumentsToParametersMapper.java index 827aee18ee8..f211a1f6932 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ValueArgumentsToParametersMapper.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ValueArgumentsToParametersMapper.java @@ -16,8 +16,6 @@ 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 kotlin.collections.CollectionsKt; import org.jetbrains.annotations.NotNull; @@ -27,7 +25,6 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.psi.psiUtil.KtPsiUtilKt; import org.jetbrains.kotlin.psi.psiUtil.ReservedCheckingKt; import org.jetbrains.kotlin.resolve.OverrideResolver; 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.tasks.TracingStrategy; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.diagnostics.Errors.BadNamedArgumentsTarget.*; @@ -88,8 +82,8 @@ public class ValueArgumentsToParametersMapper { private final Map parameterByName; private Map parameterByNameInOverriddenMethods; - private final Map varargs = Maps.newHashMap(); - private final Set usedParameters = Sets.newHashSet(); + private final Map varargs = new HashMap<>(); + private final Set usedParameters = new HashSet<>(); private Status status = OK; private Processor(@NotNull Call call, @NotNull MutableResolvedCall candidateCall, @NotNull TracingStrategy tracing) { @@ -98,7 +92,7 @@ public class ValueArgumentsToParametersMapper { this.candidateCall = candidateCall; this.parameters = candidateCall.getCandidateDescriptor().getValueParameters(); - this.parameterByName = Maps.newHashMap(); + this.parameterByName = new HashMap<>(); for (ValueParameterDescriptor valueParameter : parameters) { parameterByName.put(valueParameter.getName(), valueParameter); } @@ -107,7 +101,7 @@ public class ValueArgumentsToParametersMapper { @Nullable private ValueParameterDescriptor getParameterByNameInOverriddenMethods(Name name) { if (parameterByNameInOverriddenMethods == null) { - parameterByNameInOverriddenMethods = Maps.newHashMap(); + parameterByNameInOverriddenMethods = new HashMap<>(); for (ValueParameterDescriptor valueParameter : parameters) { for (ValueParameterDescriptor parameterDescriptor : valueParameter.getOverriddenDescriptors()) { parameterByNameInOverriddenMethods.put(parameterDescriptor.getName(), valueParameter); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java index 9cb7a2d6b7a..17ffcb7f519 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.resolve.calls.model; -import com.google.common.collect.Maps; import com.intellij.openapi.diagnostic.Logger; import com.intellij.util.SmartList; import kotlin.Unit; @@ -132,17 +131,17 @@ public class ResolvedCallImpl implements MutableRe @NotNull private static Map createValueArgumentsMap(CallableDescriptor descriptor) { - return descriptor.getValueParameters().isEmpty() ? Collections.emptyMap() : Maps.newLinkedHashMap(); + return descriptor.getValueParameters().isEmpty() ? Collections.emptyMap() : new LinkedHashMap<>(); } @NotNull private static Map createArgumentsToParameterMap(CallableDescriptor descriptor) { - return descriptor.getValueParameters().isEmpty() ? Collections.emptyMap() : Maps.newHashMap(); + return descriptor.getValueParameters().isEmpty() ? Collections.emptyMap() : new HashMap<>(); } @NotNull private static Map createTypeArgumentsMap(CallableDescriptor descriptor) { - return descriptor.getTypeParameters().isEmpty() ? Collections.emptyMap() : Maps.newLinkedHashMap(); + return descriptor.getTypeParameters().isEmpty() ? Collections.emptyMap() : new LinkedHashMap<>(); } @Override diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionResultsHandler.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionResultsHandler.java index 584f28c6c65..fe640dc9709 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionResultsHandler.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionResultsHandler.java @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.resolve.calls.results; -import com.google.common.collect.Sets; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.config.LanguageFeature; @@ -56,10 +55,10 @@ public class ResolutionResultsHandler { @NotNull Collection> candidates, @NotNull LanguageVersionSettings languageVersionSettings ) { - Set> successfulCandidates = Sets.newLinkedHashSet(); - Set> failedCandidates = Sets.newLinkedHashSet(); - Set> incompleteCandidates = Sets.newLinkedHashSet(); - Set> candidatesWithWrongReceiver = Sets.newLinkedHashSet(); + Set> successfulCandidates = new LinkedHashSet<>(); + Set> failedCandidates = new LinkedHashSet<>(); + Set> incompleteCandidates = new LinkedHashSet<>(); + Set> candidatesWithWrongReceiver = new LinkedHashSet<>(); for (MutableResolvedCall candidateCall : candidates) { ResolutionStatus status = candidateCall.getStatus(); assert status != UNKNOWN_STATUS : "No resolution for " + candidateCall.getCandidateDescriptor(); @@ -102,7 +101,7 @@ public class ResolutionResultsHandler { @NotNull CheckArgumentTypesMode checkArgumentsMode, @NotNull LanguageVersionSettings languageVersionSettings ) { - Set> successfulAndIncomplete = Sets.newLinkedHashSet(); + Set> successfulAndIncomplete = new LinkedHashSet<>(); successfulAndIncomplete.addAll(successfulCandidates); successfulAndIncomplete.addAll(incompleteCandidates); OverloadResolutionResultsImpl results = chooseAndReportMaximallySpecific( @@ -148,7 +147,7 @@ public class ResolutionResultsHandler { } for (EnumSet severityLevel : SEVERITY_LEVELS) { - Set> thisLevel = Sets.newLinkedHashSet(); + Set> thisLevel = new LinkedHashSet<>(); for (MutableResolvedCall candidate : failedCandidates) { if (severityLevel.contains(candidate.getStatus())) { thisLevel.add(candidate); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/AbstractTracingStrategy.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/AbstractTracingStrategy.java index 3b2ae430de1..bdbe0162e87 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/AbstractTracingStrategy.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/AbstractTracingStrategy.java @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.resolve.calls.tasks; -import com.google.common.collect.Sets; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; @@ -45,6 +44,7 @@ import org.jetbrains.kotlin.types.Variance; import org.jetbrains.kotlin.types.expressions.OperatorConventions; import java.util.Collection; +import java.util.HashSet; import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.resolve.BindingContext.AMBIGUOUS_REFERENCE_TARGET; @@ -64,7 +64,7 @@ public abstract class AbstractTracingStrategy implements TracingStrategy { @Override public void recordAmbiguity(@NotNull BindingTrace trace, @NotNull Collection> candidates) { - Collection descriptors = Sets.newHashSet(); + Collection descriptors = new HashSet<>(); for (ResolvedCall candidate : candidates) { descriptors.add(candidate.getCandidateDescriptor()); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt index c8ea0877d17..4806de21fac 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.resolve.lazy.declarations import com.google.common.collect.ArrayListMultimap -import com.google.common.collect.Sets import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.safeNameForLazyResolve @@ -38,7 +37,7 @@ abstract class AbstractPsiBasedDeclarationProvider(storageManager: StorageManage val classesAndObjects = ArrayListMultimap.create() // order matters here val typeAliases = ArrayListMultimap.create() val destructuringDeclarationsEntries = ArrayListMultimap.create() - val names = Sets.newHashSet() + val names = hashSetOf() fun putToIndex(declaration: KtDeclaration) { if (declaration is KtAnonymousInitializer || declaration is KtSecondaryConstructor) return diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java index a22b529d621..0d359da2002 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.resolve.lazy.declarations; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; import kotlin.collections.CollectionsKt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -29,13 +28,14 @@ import org.jetbrains.kotlin.storage.NotNullLazyValue; import org.jetbrains.kotlin.storage.StorageManager; import java.util.Collection; +import java.util.HashSet; import java.util.Set; public class FileBasedDeclarationProviderFactory extends AbstractDeclarationProviderFactory { private static class Index { private final Multimap filesByPackage = LinkedHashMultimap.create(); - private final Set declaredPackages = Sets.newHashSet(); + private final Set declaredPackages = new HashSet<>(); } private final StorageManager storageManager; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt index ebc349cf3f1..58a99da61f2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.resolve.lazy.descriptors -import com.google.common.collect.Sets import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.incremental.components.LookupLocation import org.jetbrains.kotlin.lexer.KtTokens @@ -55,7 +54,7 @@ protected constructor( storageManager.createMemoizedFunction { doGetTypeAliases(it) } private fun doGetClasses(name: Name): List { - val result = Sets.newLinkedHashSet() + val result = linkedSetOf() declarationProvider.getClassOrObjectDeclarations(name).mapTo(result) { if (it is KtScriptInfo) LazyScriptDescriptor(c as ResolveSession, thisDescriptor, name, it) @@ -92,7 +91,7 @@ protected constructor( } private fun doGetFunctions(name: Name): Collection { - val result = Sets.newLinkedHashSet() + val result = linkedSetOf() val declarations = declarationProvider.getFunctionDeclarations(name) for (functionDeclaration in declarations) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/SubstitutionUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/types/SubstitutionUtils.java index 50ff55c0057..99c523f37eb 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/SubstitutionUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/SubstitutionUtils.java @@ -17,13 +17,13 @@ package org.jetbrains.kotlin.types; import com.google.common.collect.LinkedHashMultimap; -import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -36,7 +36,7 @@ public class SubstitutionUtils { */ @NotNull public static TypeSubstitutor buildDeepSubstitutor(@NotNull KotlinType type) { - Map substitution = Maps.newHashMap(); + Map substitution = new HashMap<>(); TypeSubstitutor typeSubstitutor = TypeSubstitutor.create(substitution); // we use the mutability of the map here fillInDeepSubstitutor(type, typeSubstitutor, substitution, null); @@ -59,7 +59,7 @@ public class SubstitutionUtils { @NotNull public static Multimap buildDeepSubstitutionMultimap(@NotNull KotlinType type) { Multimap fullSubstitution = LinkedHashMultimap.create(); - Map substitution = Maps.newHashMap(); + Map substitution = new HashMap<>(); TypeSubstitutor typeSubstitutor = TypeSubstitutor.create(substitution); // we use the mutability of the map here fillInDeepSubstitutor(type, typeSubstitutor, substitution, fullSubstitution); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/TypeUnifier.java b/compiler/frontend/src/org/jetbrains/kotlin/types/TypeUnifier.java index 452ba80bf16..97ab4957fc9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/TypeUnifier.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/TypeUnifier.java @@ -17,9 +17,10 @@ package org.jetbrains.kotlin.types; import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.utils.CollectionsKt; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -138,8 +139,8 @@ public class TypeUnifier { private static class UnificationResultImpl implements UnificationResult { private boolean success = true; - private final Map substitution = Maps.newHashMapWithExpectedSize(1); - private final Set failedVariables = Sets.newHashSetWithExpectedSize(0); + private final Map substitution = CollectionsKt.newHashMapWithExpectedSize(1); + private final Set failedVariables = CollectionsKt.newHashSetWithExpectedSize(0); @Override public boolean isSuccess() { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java index c271287a364..82e9ee48c73 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.types.expressions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.intellij.lang.ASTNode; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.Ref; @@ -233,7 +232,7 @@ public class ControlStructureTypingUtils { @NotNull DataFlowInfo thenInfo, @NotNull DataFlowInfo elseInfo ) { - Map dataFlowInfoForArgumentsMap = Maps.newHashMap(); + Map dataFlowInfoForArgumentsMap = new HashMap<>(); dataFlowInfoForArgumentsMap.put(callForIf.getValueArguments().get(0), thenInfo); dataFlowInfoForArgumentsMap.put(callForIf.getValueArguments().get(1), elseInfo); return createIndependentDataFlowInfoForArgumentsForCall(conditionInfo, dataFlowInfoForArgumentsMap); @@ -244,7 +243,7 @@ public class ControlStructureTypingUtils { @NotNull DataFlowInfo subjectDataFlowInfo, @NotNull List entryDataFlowInfos ) { - Map dataFlowInfoForArgumentsMap = Maps.newHashMap(); + Map dataFlowInfoForArgumentsMap = new HashMap<>(); int i = 0; for (ValueArgument argument : callForWhen.getValueArguments()) { DataFlowInfo entryDataFlowInfo = entryDataFlowInfos.get(i++); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java index a0941eed1ee..eabcfc017de 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.types.expressions; -import com.google.common.collect.Sets; import com.intellij.psi.tree.IElementType; import kotlin.Pair; import org.jetbrains.annotations.NotNull; @@ -50,6 +49,7 @@ import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryKt; import org.jetbrains.kotlin.util.OperatorNameConventions; import java.util.Collection; +import java.util.HashSet; import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.psi.KtPsiUtil.deparenthesize; @@ -260,7 +260,7 @@ public class ExpressionTypingVisitorForStatements extends ExpressionTypingVisito // Both 'plus()' and 'plusAssign()' available => ambiguity OverloadResolutionResults ambiguityResolutionResults = OverloadResolutionResultsUtil.ambiguity(assignmentOperationDescriptors, binaryOperationDescriptors); context.trace.report(ASSIGN_OPERATOR_AMBIGUITY.on(operationSign, ambiguityResolutionResults.getResultingCalls())); - Collection descriptors = Sets.newHashSet(); + Collection descriptors = new HashSet<>(); for (ResolvedCall resolvedCall : ambiguityResolutionResults.getResultingCalls()) { descriptors.add(resolvedCall.getResultingDescriptor()); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.kt index 70f71fb02a5..b17194734ca 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.types.expressions -import com.google.common.collect.Sets import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor @@ -35,7 +34,7 @@ import org.jetbrains.kotlin.resolve.scopes.utils.getDeclarationsByLabel object LabelResolver { private fun getElementsByLabelName(labelName: Name, labelExpression: KtSimpleNameExpression): Set { - val elements = Sets.newLinkedHashSet() + val elements = linkedSetOf() var parent: PsiElement? = labelExpression.parent while (parent != null) { val name = getLabelNameIfAny(parent) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/MapSupplier.java b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/MapSupplier.java index 7b023237359..eddd7e13482 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/MapSupplier.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/MapSupplier.java @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.util.slicedMap; -import com.google.common.collect.Maps; - +import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; public interface MapSupplier { @@ -25,14 +25,14 @@ public interface MapSupplier { MapSupplier HASH_MAP_SUPPLIER = new MapSupplier() { @Override public Map get() { - return Maps.newHashMap(); + return new HashMap<>(); } }; MapSupplier LINKED_HASH_MAP_SUPPLIER = new MapSupplier() { @Override public Map get() { - return Maps.newLinkedHashMap(); + return new LinkedHashMap<>(); } }; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/TrackingSlicedMap.java b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/TrackingSlicedMap.java index bc2165c0110..3e810bab495 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/TrackingSlicedMap.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/TrackingSlicedMap.java @@ -16,16 +16,16 @@ package org.jetbrains.kotlin.util.slicedMap; -import com.google.common.collect.Maps; import kotlin.jvm.functions.Function3; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.utils.Printer; import java.util.Collection; +import java.util.HashMap; import java.util.Map; public class TrackingSlicedMap extends SlicedMapImpl { - private final Map, SliceWithStackTrace> sliceTranslationMap = Maps.newHashMap(); + private final Map, SliceWithStackTrace> sliceTranslationMap = new HashMap<>(); private final boolean trackWithStackTraces; public TrackingSlicedMap(boolean trackWithStackTraces) { diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IntrinsicsMap.java b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IntrinsicsMap.java index a8982601c09..e12f51cd182 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IntrinsicsMap.java +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IntrinsicsMap.java @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.backend.jvm.intrinsics; -import com.google.common.collect.Maps; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; 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.resolve.DescriptorUtils; +import java.util.HashMap; import java.util.Map; class IntrinsicsMap { @@ -74,7 +74,7 @@ class IntrinsicsMap { } } - private final Map intrinsicsMap = Maps.newHashMap(); + private final Map intrinsicsMap = new HashMap<>(); /** diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.java new file mode 100644 index 00000000000..e69de29bb2d diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtImportsFactory.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtImportsFactory.java index c8969fa350b..fa5bfbe4562 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtImportsFactory.java +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtImportsFactory.java @@ -16,19 +16,19 @@ package org.jetbrains.kotlin.psi; -import com.google.common.collect.Maps; import com.intellij.openapi.project.Project; import kotlin.collections.CollectionsKt; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.resolve.ImportPath; import java.util.Collection; +import java.util.HashMap; import java.util.Map; public class KtImportsFactory { @NotNull private final Project project; - private final Map importsCache = Maps.newHashMap(); + private final Map importsCache = new HashMap<>(); public KtImportsFactory(@NotNull Project project) { this.project = project; diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java index 6eb282502b5..fe1d29f8c54 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.codegen; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import kotlin.Pair; @@ -160,7 +159,7 @@ public abstract class AbstractLineNumberTest extends TestCaseWithTmpdir { @NotNull private static List readTestFunLineNumbers(@NotNull ClassReader cr) { List