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 insertMembersAfter( } } - ShortenReferences.DEFAULT.process(insertedMembers) - + @Suppress("UNCHECKED_CAST") val resultMembers = ShortenReferences.DEFAULT.process(insertedMembers) as Collection + 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() } }