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

Smart completion: auto-popup parameter info when comma is inserted

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-04-22 11:44:32 +04:00
parent 134496d182
commit e017f4d952
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/handlers/WithTailInsertHandlers.kt
+17 -12
View File
@@ -2,13 +2,13 @@ package org.jetbrains.jet.plugin.completion.handlers
import com.intellij.codeInsight.completion.* import com.intellij.codeInsight.completion.*
import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.lookup.LookupElement
import com.intellij.openapi.editor.*
import com.intellij.openapi.editor.event.* import com.intellij.openapi.editor.event.*
import com.intellij.openapi.util.TextRange import com.intellij.openapi.util.TextRange
import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiDocumentManager
import com.intellij.codeInsight.AutoPopupController
abstract class WithTailInsertHandlerBase : InsertHandler<LookupElement> { abstract class WithTailInsertHandlerBase : InsertHandler<LookupElement> {
protected abstract fun insertTail(document: Document, offset: Int): Int protected abstract fun insertTail(context: InsertionContext, offset: Int, moveCaret: Boolean)
override fun handleInsert(context: InsertionContext, item: LookupElement) { override fun handleInsert(context: InsertionContext, item: LookupElement) {
val document = context.getDocument() val document = context.getDocument()
@@ -39,16 +39,13 @@ abstract class WithTailInsertHandlerBase : InsertHandler<LookupElement> {
document.removeDocumentListener(documentListener) document.removeDocumentListener(documentListener)
} }
val moveCaret = caretModel.getOffset() == maxChangeOffset insertTail(context, maxChangeOffset, caretModel.getOffset() == maxChangeOffset)
val endTailOffset = insertTail(document, maxChangeOffset)
if (moveCaret) {
caretModel.moveToOffset(endTailOffset)
}
} }
} }
class WithTailCharInsertHandler(val tailChar: Char, val spaceAfter: Boolean) : WithTailInsertHandlerBase() { class WithTailCharInsertHandler(val tailChar: Char, val spaceAfter: Boolean) : WithTailInsertHandlerBase() {
override fun insertTail(document: Document, offset: Int): Int { override fun insertTail(context: InsertionContext, offset: Int, moveCaret: Boolean) {
val document = context.getDocument()
fun isCharAt(offset: Int, c: Char) = offset < document.getTextLength() && document.getText(TextRange(offset, offset + 1))[0] == c fun isCharAt(offset: Int, c: Char) = offset < document.getTextLength() && document.getText(TextRange(offset, offset + 1))[0] == c
if (isCharAt(offset, tailChar)) { if (isCharAt(offset, tailChar)) {
@@ -61,13 +58,21 @@ class WithTailCharInsertHandler(val tailChar: Char, val spaceAfter: Boolean) : W
val textToInsert = if (spaceAfter) tailChar + " " else tailChar.toString() val textToInsert = if (spaceAfter) tailChar + " " else tailChar.toString()
document.insertString(offset, textToInsert) document.insertString(offset, textToInsert)
return offset + textToInsert.length if (moveCaret) {
context.getEditor().getCaretModel().moveToOffset(offset + textToInsert.length)
if (tailChar == ',') {
AutoPopupController.getInstance(context.getProject())?.autoPopupParameterInfo(context.getEditor(), null)
}
}
} }
} }
class WithTailStringInsertHandler(val tail: String) : WithTailInsertHandlerBase() { class WithTailStringInsertHandler(val tail: String) : WithTailInsertHandlerBase() {
override fun insertTail(document: Document, offset: Int): Int { override fun insertTail(context: InsertionContext, offset: Int, moveCaret: Boolean) {
document.insertString(offset, tail) context.getDocument().insertString(offset, tail)
return offset + tail.length if (moveCaret) {
context.getEditor().getCaretModel().moveToOffset(offset + tail.length)
}
} }
} }