From 0ef4b22cf3737bee31e91d5c656a99103252f439 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 13 Aug 2020 18:29:18 +0200 Subject: [PATCH] Remove deprecated usages of ContainerUtil --- .../cli/common/messages/OutputMessageUtil.java | 4 ++-- .../impl/classFiles/BinaryClassSignatureParser.kt | 8 ++++---- .../structure/impl/classFiles/BinaryJavaClass.kt | 6 +++--- .../java/structure/impl/classFiles/Methods.kt | 15 ++++++--------- .../load/java/structure/impl/classFiles/Other.kt | 6 +++--- .../load/java/structure/impl/classFiles/Types.kt | 4 ++-- .../jetbrains/kotlin/checkers/DiagnosedRange.kt | 4 ++-- .../kotlin/resolve/calls/CallResolverUtil.kt | 4 ++-- .../asJava/classes/KotlinClassInnerStuffCache.kt | 8 ++++---- .../jetbrains/kotlin/psi/KtPackageDirective.java | 4 ++-- .../jetbrains/kotlin/test/KotlinTestUtils.java | 4 ++-- 11 files changed, 32 insertions(+), 35 deletions(-) diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/OutputMessageUtil.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/OutputMessageUtil.java index c4f7784f289..2109a20f823 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/OutputMessageUtil.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/OutputMessageUtil.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.cli.common.messages; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -25,6 +24,7 @@ import java.io.File; import java.io.PrintWriter; import java.io.Serializable; import java.io.StringWriter; +import java.util.ArrayList; import java.util.Collection; public class OutputMessageUtil { @@ -69,7 +69,7 @@ public class OutputMessageUtil { } private static Collection parseSourceFiles(String[] strings, int start) { - Collection sourceFiles = ContainerUtil.newArrayList(); + Collection sourceFiles = new ArrayList<>(); for (int i = start; i < strings.length; i++) { sourceFiles.add(new File(strings[i])); } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/BinaryClassSignatureParser.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/BinaryClassSignatureParser.kt index caca65cef74..3e5d23c7580 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/BinaryClassSignatureParser.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/BinaryClassSignatureParser.kt @@ -16,13 +16,13 @@ package org.jetbrains.kotlin.load.java.structure.impl.classFiles -import com.intellij.util.containers.ContainerUtil import com.intellij.util.containers.StringInterner import org.jetbrains.kotlin.builtins.PrimitiveType import org.jetbrains.kotlin.load.java.structure.JavaClassifierType import org.jetbrains.kotlin.load.java.structure.JavaType import org.jetbrains.kotlin.load.java.structure.JavaTypeParameter import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.utils.SmartList import org.jetbrains.kotlin.utils.addToStdlib.flattenTo import org.jetbrains.kotlin.utils.compact import org.jetbrains.org.objectweb.asm.Type @@ -44,7 +44,7 @@ class BinaryClassSignatureParser { return emptyList() } - val typeParameters = ContainerUtil.newArrayList() + val typeParameters = arrayListOf() signature.next() while (signature.current() != '>') { typeParameters.add(parseTypeParameter(signature, context)) @@ -65,7 +65,7 @@ class BinaryClassSignatureParser { val parameterName = name.toString() // postpone list allocation till a second bound is seen; ignore sole Object bound - val bounds: MutableList = ContainerUtil.newSmartList() + val bounds: MutableList = SmartList() while (signature.current() == ':') { signature.next() val bound = parseClassifierRefSignature(signature, context) ?: continue @@ -110,7 +110,7 @@ class BinaryClassSignatureParser { ): JavaClassifierType { val canonicalName = StringBuilder() - val argumentGroups = ContainerUtil.newSmartList>() + val argumentGroups = SmartList>() signature.next() while (signature.current() != ';' && signature.current() != CharacterIterator.DONE) { diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/BinaryJavaClass.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/BinaryJavaClass.kt index 9a568559eb8..243a4b4fa94 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/BinaryJavaClass.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/BinaryJavaClass.kt @@ -18,13 +18,13 @@ package org.jetbrains.kotlin.load.java.structure.impl.classFiles import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.search.SearchScope -import com.intellij.util.containers.ContainerUtil import gnu.trove.THashMap import org.jetbrains.kotlin.builtins.PrimitiveType import org.jetbrains.kotlin.load.java.structure.* import org.jetbrains.kotlin.load.java.structure.impl.VirtualFileBoundJavaClass import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.utils.SmartList import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.org.objectweb.asm.* import java.text.CharacterIterator @@ -41,7 +41,7 @@ class BinaryJavaClass( ) : ClassVisitor(ASM_API_VERSION_FOR_CLASS_READING), VirtualFileBoundJavaClass, BinaryJavaModifierListOwner, MapBasedJavaAnnotationOwner { private lateinit var myInternalName: String - override val annotations: MutableCollection = ContainerUtil.newSmartList() + override val annotations: MutableCollection = SmartList() override lateinit var typeParameters: List override lateinit var supertypes: Collection override val methods = arrayListOf() @@ -150,7 +150,7 @@ class BinaryJavaClass( .parseTypeParametersDeclaration(iterator, context) .also(context::addTypeParameters) - val supertypes = ContainerUtil.newSmartList() + val supertypes = SmartList() supertypes.addIfNotNull(signatureParser.parseClassifierRefSignature(iterator, context)) while (iterator.current() != CharacterIterator.DONE) { supertypes.addIfNotNull(signatureParser.parseClassifierRefSignature(iterator, context)) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Methods.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Methods.kt index ee5f632088e..77ef489fc6b 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Methods.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Methods.kt @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.load.java.structure.impl.classFiles import com.intellij.util.cls.ClsFormatException -import com.intellij.util.containers.ContainerUtil import org.jetbrains.kotlin.load.java.structure.* import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.SpecialNames +import org.jetbrains.kotlin.utils.SmartList import org.jetbrains.kotlin.utils.compact import org.jetbrains.org.objectweb.asm.MethodVisitor import org.jetbrains.org.objectweb.asm.Opcodes @@ -37,7 +37,7 @@ abstract class BinaryJavaMethodBase( ) : JavaMember, MapBasedJavaAnnotationOwner, BinaryJavaModifierListOwner { override val annotationsByFqName by buildLazyValueForMap() - override val annotations: Collection = ContainerUtil.newSmartList() + override val annotations: Collection = SmartList() companion object { private class MethodInfo( @@ -80,13 +80,10 @@ abstract class BinaryJavaMethodBase( } val parameterTypes = info.valueParameterTypes - val parameterList = ContainerUtil.newArrayList() val paramCount = parameterTypes.size - for (i in 0 until paramCount) { - val type = parameterTypes[i] + val parameterList = parameterTypes.mapIndexed { i, type -> val isEllipsisParam = isVarargs && i == paramCount - 1 - - parameterList.add(BinaryJavaValueParameter(type, isEllipsisParam)) + BinaryJavaValueParameter(type, isEllipsisParam) } val member: BinaryJavaMethodBase = @@ -95,7 +92,7 @@ abstract class BinaryJavaMethodBase( else BinaryJavaMethod( access, containingClass, - parameterList.compact(), + parameterList, info.typeParameters, Name.identifier(name), info.returnType ) @@ -142,7 +139,7 @@ abstract class BinaryJavaMethodBase( paramTypes = emptyList() } else { - paramTypes = ContainerUtil.newArrayList() + paramTypes = mutableListOf() while (iterator.current() != ')' && iterator.current() != CharacterIterator.DONE) { paramTypes.add(signatureParser.parseTypeString(iterator, context)) } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Other.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Other.kt index 2e43b0ba6be..72fc2c3d979 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Other.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Other.kt @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.load.java.structure.impl.classFiles -import com.intellij.util.containers.ContainerUtil import org.jetbrains.kotlin.load.java.structure.* import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.utils.SmartList import org.jetbrains.org.objectweb.asm.ClassReader import org.jetbrains.org.objectweb.asm.ClassVisitor @@ -31,7 +31,7 @@ class BinaryJavaField( override val type: JavaType, override val initializerValue: Any? ) : JavaField, MapBasedJavaAnnotationOwner, BinaryJavaModifierListOwner { - override val annotations: MutableCollection = ContainerUtil.newSmartList() + override val annotations: MutableCollection = SmartList() override val annotationsByFqName by buildLazyValueForMap() override val hasConstantNotNullInitializer: Boolean @@ -53,7 +53,7 @@ class BinaryJavaValueParameter( override val type: JavaType, override val isVararg: Boolean ) : JavaValueParameter, MapBasedJavaAnnotationOwner { - override val annotations: MutableCollection = ContainerUtil.newSmartList() + override val annotations: MutableCollection = SmartList() override val annotationsByFqName by buildLazyValueForMap() override var name: Name? = null diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Types.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Types.kt index 47542d57c07..9c17f038908 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Types.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Types.kt @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.load.java.structure.impl.classFiles -import com.intellij.util.containers.ContainerUtil import org.jetbrains.kotlin.builtins.PrimitiveType import org.jetbrains.kotlin.load.java.structure.* import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.utils.SmartList import org.jetbrains.kotlin.utils.addToStdlib.safeAs // They are only used for java class files, but potentially may be used in other cases @@ -47,7 +47,7 @@ internal class PlainJavaClassifierType( internal fun addAnnotation(annotation: JavaAnnotation) { if (_annotations.isEmpty()) { - _annotations = ContainerUtil.newSmartList() + _annotations = SmartList() } (_annotations as MutableList).add(annotation) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/checkers/DiagnosedRange.kt b/compiler/frontend/src/org/jetbrains/kotlin/checkers/DiagnosedRange.kt index 84cd26e8d0c..28bf8ffa3dc 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/checkers/DiagnosedRange.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/checkers/DiagnosedRange.kt @@ -5,12 +5,12 @@ package org.jetbrains.kotlin.checkers -import com.intellij.util.containers.ContainerUtil import org.jetbrains.kotlin.checkers.diagnostics.TextDiagnostic +import org.jetbrains.kotlin.utils.SmartList class DiagnosedRange constructor(val start: Int) { var end: Int = 0 - private val diagnostics = ContainerUtil.newSmartList() + private val diagnostics = SmartList() fun getDiagnostics(): List { return diagnostics diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolverUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolverUtil.kt index a4f47479855..49dca5fe9bd 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolverUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolverUtil.kt @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.resolve.calls.callResolverUtil import com.google.common.collect.Lists -import com.intellij.util.containers.ContainerUtil import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.builtins.ReflectionTypes import org.jetbrains.kotlin.builtins.isSuspendFunctionType @@ -38,6 +37,7 @@ import org.jetbrains.kotlin.types.TypeUtils.DONT_CARE import org.jetbrains.kotlin.types.checker.KotlinTypeChecker import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.kotlin.types.typeUtil.contains +import org.jetbrains.kotlin.utils.SmartList enum class ResolveArgumentsMode { RESOLVE_FUNCTION_ARGUMENTS, @@ -108,7 +108,7 @@ fun getErasedReceiverType(receiverParameterDescriptor: ReceiverParameterDescript receiverType = TypeIntersector.intersectUpperBounds(typeParameter, properUpperBounds) } } - val fakeTypeArguments = ContainerUtil.newSmartList() + val fakeTypeArguments = SmartList() for (typeProjection in receiverType.arguments) { fakeTypeArguments.add(TypeProjectionImpl(typeProjection.projectionKind, DONT_CARE)) } diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KotlinClassInnerStuffCache.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KotlinClassInnerStuffCache.kt index 3e8acd60262..b737a77d9cc 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KotlinClassInnerStuffCache.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KotlinClassInnerStuffCache.kt @@ -19,8 +19,8 @@ import com.intellij.psi.scope.NameHint import com.intellij.psi.scope.PsiScopeProcessor import com.intellij.psi.util.CachedValueProvider import com.intellij.util.ArrayUtil -import com.intellij.util.containers.ContainerUtil import gnu.trove.THashMap +import org.jetbrains.kotlin.utils.SmartList import java.util.concurrent.TimeUnit import java.util.concurrent.locks.ReentrantLock @@ -176,17 +176,17 @@ class KotlinClassInnerStuffCache(val myClass: PsiExtensibleClass, externalDepend val methods = this.methods if (methods.isEmpty()) return emptyMap() - val collectedMethods = ContainerUtil.newHashMap>() + val collectedMethods = hashMapOf>() for (method in methods) { var list: MutableList? = collectedMethods[method.name] if (list == null) { - list = ContainerUtil.newSmartList() + list = SmartList() collectedMethods[method.name] = list } list.add(method) } - val cachedMethods = ContainerUtil.newTroveMap>() + val cachedMethods = THashMap>() for ((key, list) in collectedMethods) { cachedMethods[key] = list.toTypedArray() } diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtPackageDirective.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtPackageDirective.java index 525bce0873c..79679c41fea 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtPackageDirective.java +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtPackageDirective.java @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; -import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.lexer.KtTokens; @@ -29,6 +28,7 @@ import org.jetbrains.kotlin.psi.psiUtil.KtPsiUtilKt; import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes; +import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -54,7 +54,7 @@ public class KtPackageDirective extends KtModifierListOwnerStub packageNames = ContainerUtil.newArrayList(); + List packageNames = new ArrayList<>(); while (nameExpression instanceof KtQualifiedExpression) { KtQualifiedExpression qualifiedExpression = (KtQualifiedExpression) nameExpression; diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java index 6446618a7fa..b96758d6632 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java @@ -608,7 +608,7 @@ public class KotlinTestUtils { } assert lastChild != null; - List comments = ContainerUtil.newArrayList(); + List comments = new ArrayList<>(); while (true) { if (lastChild.getNode().getElementType().equals(KtTokens.BLOCK_COMMENT)) { @@ -1006,7 +1006,7 @@ public class KotlinTestUtils { } private static Set collectPathsMetadata(Class testCaseClass) { - return ContainerUtil.newHashSet(ContainerUtil.map(collectMethodsMetadata(testCaseClass), KotlinTestUtils::nameToCompare)); + return new HashSet<>(ContainerUtil.map(collectMethodsMetadata(testCaseClass), KotlinTestUtils::nameToCompare)); } @Nullable