From 1e7b96aec0aed7eeb0bf495b94f100e55a8a2959 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Fri, 19 Jun 2015 17:28:37 +0300 Subject: [PATCH] replace ArrayList to SmartList --- .../org/jetbrains/kotlin/resolve/calls/CallResolverUtil.java | 4 +++- .../jetbrains/kotlin/resolve/calls/tasks/ResolutionTask.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolverUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolverUtil.java index 904b0c54e8e..fbea050b811 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolverUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolverUtil.java @@ -17,6 +17,8 @@ package org.jetbrains.kotlin.resolve.calls; import com.google.common.collect.Lists; +import com.intellij.util.SmartList; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.CallableDescriptor; @@ -116,7 +118,7 @@ public class CallResolverUtil { receiverType = typeParameter.getUpperBoundsAsType(); } } - List fakeTypeArguments = Lists.newArrayList(); + List fakeTypeArguments = ContainerUtil.newSmartList(); for (TypeProjection typeProjection : receiverType.getArguments()) { fakeTypeArguments.add(new TypeProjectionImpl(typeProjection.getProjectionKind(), DONT_CARE)); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTask.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTask.java index 304b573f017..2dc4f79e5a2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTask.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTask.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.resolve.calls.tasks; -import com.google.common.collect.Lists; +import com.intellij.util.SmartList; import kotlin.jvm.functions.Function0; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -82,7 +82,7 @@ public class ResolutionTask extends C context.expectedType, context.dataFlowInfo, context.contextDependency, context.checkArguments, context.resolutionResultsCache, context.dataFlowInfoForArguments, context.callChecker, context.symbolUsageValidator, context.additionalTypeChecker, - context.statementFilter, Lists.>newArrayList(), + context.statementFilter, new SmartList>(), context.isAnnotationContext, context.collectAllCandidates, context.insideCallChain); }