From 42aa9e23785cf9b291b3cc1f6f66a87eca9caa35 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 6 Jun 2014 15:00:11 +0400 Subject: [PATCH] Minor. Utility moved to a common place --- .../util.runtime/src/org/jetbrains/jet/utils/collections.kt | 6 +++++- .../plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/util.runtime/src/org/jetbrains/jet/utils/collections.kt b/core/util.runtime/src/org/jetbrains/jet/utils/collections.kt index 921fd681d5f..52587adeab8 100644 --- a/core/util.runtime/src/org/jetbrains/jet/utils/collections.kt +++ b/core/util.runtime/src/org/jetbrains/jet/utils/collections.kt @@ -79,4 +79,8 @@ public fun Iterable>.flatten(): List { return flatMapTo(ArrayList(), {it}) } -public fun emptyOrSingletonList(item: T?): List = if (item == null) listOf() else listOf(item) \ No newline at end of file +public fun emptyOrSingletonList(item: T?): List = if (item == null) listOf() else listOf(item) + +public fun MutableCollection.addIfNotNull(t: T?) { + if (t != null) add(t) +} \ No newline at end of file diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt index 75cee97f8a3..3ada61534df 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt @@ -370,6 +370,4 @@ private fun PsiElement.isInCopiedArea(fileCopiedFrom: JetFile, startOffsets: Int val (start, end) = it range in TextRange(start, end) } -} - -private fun MutableCollection.addIfNotNull(el: T?) = ContainerUtil.addIfNotNull(this, el) \ No newline at end of file +} \ No newline at end of file