From ada695bd17fe1b0b287f689b1a4b4023aba54739 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 5 Oct 2017 14:59:17 +0200
Subject: [PATCH] Fix loop in parent structure on 'when' condition with
 expression

---
 .../src/org/jetbrains/uast/kotlin/KotlinAbstractUElement.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinAbstractUElement.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinAbstractUElement.kt
index 918b8465869..35e335a6966 100644
--- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinAbstractUElement.kt
+++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinAbstractUElement.kt
@@ -51,7 +51,7 @@ abstract class KotlinAbstractUElement(private val givenParent: UElement?) : UEle
             }
         }
 
-        if (parent is KtStringTemplateExpression && parent.entries.size == 1) {
+        if ((parent is KtStringTemplateExpression && parent.entries.size == 1) || parent is KtWhenConditionWithExpression) {
             parent = parent.parent
         }