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 1ada43e00be..09955a4709d 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 @@ -45,7 +45,7 @@ fun moveCaretIntoGeneratedElement(editor: Editor, element: PsiElement) { pointer.element?.let { moveCaretIntoGeneratedElementDocumentUnblocked(editor, it) } } -class RestoreCaret(beforeElement: T, val editor: Editor?) { +class RestoreCaret(beforeElement: T, val editor: Editor?) { private val relativeOffset: Int private val beforeElementTextLength: Int = beforeElement.textLength @@ -215,10 +215,10 @@ private fun removeAfterOffset(offset: Int, whiteSpace: PsiWhiteSpace): PsiElemen } fun insertMembersAfter( - editor: Editor?, - classOrObject: KtClassOrObject, - members: Collection, - anchor: PsiElement? = null + editor: Editor?, + classOrObject: KtClassOrObject, + members: Collection, + anchor: PsiElement? = null ): List { members.ifEmpty { return emptyList() } @@ -241,16 +241,16 @@ fun insertMembersAfter( otherMembers.mapTo(insertedMembers) { if (classOrObject is KtClass && classOrObject.isEnum()) { val enumEntries = classOrObject.declarations.filterIsInstance() - val bound = (enumEntries.lastOrNull() ?: classOrObject.allChildren.firstOrNull { it.node.elementType == KtTokens.SEMICOLON }) + val bound = (enumEntries.lastOrNull() ?: classOrObject.allChildren.firstOrNull { element -> + element.node.elementType == KtTokens.SEMICOLON + }) if (it !is KtEnumEntry) { if (bound != null && afterAnchor.startOffset <= bound.startOffset) { afterAnchor = bound } - } - else if (bound == null && body.declarations.isNotEmpty()) { + } else if (bound == null && body.declarations.isNotEmpty()) { afterAnchor = body.lBrace!! - } - else if (bound != null && afterAnchor.startOffset > bound.startOffset) { + } else if (bound != null && afterAnchor.startOffset > bound.startOffset) { afterAnchor = bound.prevSibling!! } }