From 2b907359908d17638c01b145172b052d0efec895 Mon Sep 17 00:00:00 2001
From: Dmitry Gridin <dmitry.gridin@jetbrains.com>
Date: Fri, 16 Aug 2019 17:29:24 +0700
Subject: [PATCH] generateUtil: fix PIEAE #EA-209598 Fixed #EA-142347 Fixed

---
 .../org/jetbrains/kotlin/idea/core/generateUtil.kt   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/generateUtil.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/generateUtil.kt
index 09955a4709d..cb568ff83b3 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/generateUtil.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/generateUtil.kt
@@ -260,16 +260,16 @@ fun <T : KtDeclaration> insertMembersAfter(
             }
         }
 
-        ShortenReferences.DEFAULT.process(insertedMembers)
-
+        @Suppress("UNCHECKED_CAST") val resultMembers = ShortenReferences.DEFAULT.process(insertedMembers) as Collection<T>
+        val firstElement = resultMembers.firstOrNull() ?: return@runWriteAction emptyList()
         if (editor != null) {
-            moveCaretIntoGeneratedElement(editor, insertedMembers.first())
+            moveCaretIntoGeneratedElement(editor, firstElement)
         }
 
-        val codeStyleManager = CodeStyleManager.getInstance(classOrObject.project)
-        insertedMembers.forEach { codeStyleManager.reformat(it) }
+        val codeStyleManager = CodeStyleManager.getInstance(firstElement.project)
+        resultMembers.forEach { codeStyleManager.reformat(it) }
 
-        insertedMembers
+        resultMembers.toList()
     }
 }