azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create from usage: Place caret in the declaration body/at the identifier

Browse Source 
and select function body
 #KT-6613 Fixed
 #KT-6688 Fixed
This commit is contained in:
Alexey Sedunov
2015-02-03 19:10:36 +03:00
parent 3253754395
commit 1e9f95d896
1 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
+37 -1
View File
@@ -67,6 +67,11 @@ import org.jetbrains.kotlin.idea.util.isAny
import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList
import org.jetbrains.kotlin.psi.psiUtil.siblings
import org.jetbrains.kotlin.idea.util.isUnit
import com.intellij.openapi.editor.ScrollType
import com.intellij.openapi.editor.LogicalPosition
import com.intellij.openapi.editor.actions.EditorActionUtil
import com.intellij.openapi.editor.actions.LineEndAction
import com.intellij.openapi.editor.actions.EnterAction
private val TYPE_PARAMETER_LIST_VARIABLE_NAME = "typeParameterList"
private val TEMPLATE_FROM_USAGE_FUNCTION_BODY = "New Kotlin Function Body.kt"
@@ -718,6 +723,36 @@ class CallableBuilder(val config: CallableBuilderConfiguration) {
typeRef.replace(fullyQualifiedReceiverTypeRef)
}
private fun setupEditor(declaration: JetNamedDeclaration) {
val caretModel = containingFileEditor.getCaretModel()
caretModel.moveToOffset(declaration.getNameIdentifier().getTextRange().getEndOffset())
fun positionBetween(left: PsiElement, right: PsiElement) {
val from = left.siblings(withItself = false, forward = true).firstOrNull { it !is PsiWhiteSpace } ?: return
val to = right.siblings(withItself = false, forward = false).firstOrNull { it !is PsiWhiteSpace } ?: return
val startOffset = from.getTextRange().getStartOffset()
val endOffset = to.getTextRange().getEndOffset()
caretModel.moveToOffset(endOffset)
containingFileEditor.getSelectionModel().setSelection(startOffset, endOffset)
}
when (declaration) {
is JetNamedFunction -> {
(declaration.getBodyExpression() as? JetBlockExpression)?.let { positionBetween(it.getLBrace(), it.getRBrace()) }
}
is JetClassOrObject -> {
caretModel.moveToOffset(declaration.getTextRange().getStartOffset())
}
is JetProperty -> {
if (!declaration.hasInitializer()) {
caretModel.moveToOffset(declaration.getTextRange().getEndOffset())
}
}
}
containingFileEditor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE)
}
// build templates
fun buildAndRunTemplate(onFinish: () -> Unit) {
val declarationSkeleton = createDeclarationSkeleton()
@@ -790,11 +825,12 @@ class CallableBuilder(val config: CallableBuilderConfiguration) {
setupTypeReferencesForShortening(newDeclaration, elementsToShorten, parameterTypeExpressions)
}
setupEditor(newDeclaration)
onFinish()
}
})
}
}
}