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

Extract method

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-09-22 18:23:03 +04:00
committed by valentin
parent 19fb090f28
commit f4924299dd
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/handlers/JetCallableInsertHandler.kt
+13 -9
View File
@@ -100,13 +100,12 @@ public class JetFunctionInsertHandler(val caretPosition : CaretPosition, val lam
psiDocumentManager.doPostponedOperationsAndUnblockDocument(context.getDocument()) psiDocumentManager.doPostponedOperationsAndUnblockDocument(context.getDocument())
val startOffset = context.getStartOffset() val startOffset = context.getStartOffset()
val element = context.getFile().findElementAt(startOffset) val element = context.getFile().findElementAt(startOffset) ?: return
if (element != null) { when {
if (PsiTreeUtil.getParentOfType(element, javaClass<JetImportDirective>()) != null) return PsiTreeUtil.getParentOfType(element, javaClass<JetImportDirective>()) != null -> return
val parent = element.getParent()
val grandParent = parent?.getParent() isInfixCall(element) -> {
if (parent is JetSimpleNameExpression && grandParent is JetBinaryExpression && parent == grandParent.getOperationReference()) { // infix call
if (context.getCompletionChar() == ' ') { if (context.getCompletionChar() == ' ') {
context.setAddCompletionChar(false) context.setAddCompletionChar(false)
} }
@@ -115,12 +114,17 @@ public class JetFunctionInsertHandler(val caretPosition : CaretPosition, val lam
context.getDocument().insertString(tailOffset, " ") context.getDocument().insertString(tailOffset, " ")
context.getEditor().getCaretModel().moveToOffset(tailOffset + 1) context.getEditor().getCaretModel().moveToOffset(tailOffset + 1)
} }
else {
addBrackets(context, element) else -> addBrackets(context, element)
}
} }
} }
private fun isInfixCall(context: PsiElement): Boolean {
val parent = context.getParent()
val grandParent = parent?.getParent()
return parent is JetSimpleNameExpression && grandParent is JetBinaryExpression && parent == grandParent.getOperationReference()
}
private fun addBrackets(context : InsertionContext, offsetElement : PsiElement) { private fun addBrackets(context : InsertionContext, offsetElement : PsiElement) {
if (context.getCompletionChar() == '(') { //TODO: more correct behavior related to braces type if (context.getCompletionChar() == '(') { //TODO: more correct behavior related to braces type
context.setAddCompletionChar(false) context.setAddCompletionChar(false)