From 29af6586f2109bf48432a141a5193fbb487edd10 Mon Sep 17 00:00:00 2001
From: Mikhail Zarechenskiy <mikhail.zarechenskiy@jetbrains.com>
Date: Mon, 28 Dec 2015 17:48:51 +0300
Subject: [PATCH] Get rid of ContainerUtil usages in ide-common

---
 .../kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
index 9230e105e92..a0ec2fc5290 100644
--- a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
+++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.idea.util.psi.patternMatching
 import com.intellij.lang.ASTNode
 import com.intellij.psi.PsiElement
 import com.intellij.psi.impl.source.tree.LeafPsiElement
-import com.intellij.util.containers.ContainerUtil
 import com.intellij.util.containers.MultiMap
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.idea.refactoring.getContextForContainingDeclarationBody
@@ -877,9 +876,7 @@ class KotlinPsiUnifier(
         }
     }
 
-    private val descriptorToParameter = ContainerUtil.newMapFromValues(parameters.iterator()) {
-        (it!!.descriptor as? DeclarationDescriptorWithSource)?.source?.getPsi()
-    }
+    private val descriptorToParameter = parameters.toMapBy { (it.descriptor as? DeclarationDescriptorWithSource)?.source?.getPsi() }
 
     private fun PsiElement.unwrap(): PsiElement? {
         return when (this) {