azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of ContainerUtil usages in ide-common

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2015-12-28 17:48:51 +03:00
committed by Pavel V. Talanov
parent dd11fa9320
commit 29af6586f2
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
+1 -4
View File
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.idea.util.psi.patternMatching
import com.intellij.lang.ASTNode import com.intellij.lang.ASTNode
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.impl.source.tree.LeafPsiElement import com.intellij.psi.impl.source.tree.LeafPsiElement
import com.intellij.util.containers.ContainerUtil
import com.intellij.util.containers.MultiMap import com.intellij.util.containers.MultiMap
import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.idea.refactoring.getContextForContainingDeclarationBody import org.jetbrains.kotlin.idea.refactoring.getContextForContainingDeclarationBody
@@ -877,9 +876,7 @@ class KotlinPsiUnifier(
} }
} }
private val descriptorToParameter = ContainerUtil.newMapFromValues(parameters.iterator()) { private val descriptorToParameter = parameters.toMapBy { (it.descriptor as? DeclarationDescriptorWithSource)?.source?.getPsi() }
(it!!.descriptor as? DeclarationDescriptorWithSource)?.source?.getPsi()
}
private fun PsiElement.unwrap(): PsiElement? { private fun PsiElement.unwrap(): PsiElement? {
return when (this) { return when (this) {