From 51321c8b36b6b9f58564e22809b4090858152e6b Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 2 Apr 2015 15:39:50 +0300 Subject: [PATCH] Remove deprecated isNullOrEmpty declaration, fixed usage. --- .../jetbrains/kotlin/idea/completion/smart/StaticMembers.kt | 2 +- idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/smart/StaticMembers.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/StaticMembers.kt index 3f52e42141c..ddf558d0bed 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/smart/StaticMembers.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/StaticMembers.kt @@ -122,7 +122,7 @@ class StaticMembers( presentation.setTailText(tailText, true) } - if (presentation.getTypeText().isNullOrEmptyDeprecated()) { + if (presentation.getTypeText().isNullOrEmpty()) { presentation.setTypeText(DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(classDescriptor.getDefaultType())) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt index 40be9144dea..012674b016b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt @@ -261,9 +261,6 @@ fun LookupElementFactory.createLookupElement( fun T?.toList(): List = if (this != null) listOf(this) else listOf() fun T?.toSet(): Set = if (this != null) setOf(this) else setOf() -deprecated("Use String?.isNullOrEmpty() from stdlib when available") -fun String?.isNullOrEmptyDeprecated() = this == null || this.isEmpty() - enum class SmartCompletionItemPriority { IT TRUE