generateUtil: fix PIEAE

#EA-209598 Fixed #EA-142347 Fixed
2019-08-16 17:29:24 +07:00
parent b570f99aae
commit 2b90735990
1 changed files with 6 additions and 6 deletions
@@ -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()
    }
 }