From c8c630cecb22176d3641f6f414271e29278cf18c Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 3 Apr 2019 13:18:22 +0300 Subject: [PATCH] Filter significant elements before creating ListRange EA-134385 EA-138187 --- .../kotlin/idea/util/psi/patternMatching/KotlinPsiRange.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiRange.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiRange.kt index 5a6fd311302..04c3cb04df5 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiRange.kt +++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiRange.kt @@ -92,7 +92,8 @@ interface KotlinPsiRange { } fun List.toRange(significantOnly: Boolean = true): KotlinPsiRange { - return if (isEmpty()) KotlinPsiRange.Empty else KotlinPsiRange.ListRange(if (significantOnly) filter(SIGNIFICANT_FILTER) else this) + val elements = if (significantOnly) filter(SIGNIFICANT_FILTER) else this + return if (elements.isEmpty()) KotlinPsiRange.Empty else KotlinPsiRange.ListRange(elements) } fun PsiElement?.toRange(): KotlinPsiRange = this?.let { KotlinPsiRange.ListRange(Collections.singletonList(it)) } ?: KotlinPsiRange.Empty