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

Use our own tail handler

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-14 14:38:32 +03:00
parent 7077e22dd3
commit 58a67a2bf3
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinKeywordInsertHandler.kt
+1 -5
View File
@@ -16,12 +16,9 @@
package org.jetbrains.jet.plugin.completion.handlers package org.jetbrains.jet.plugin.completion.handlers
import com.google.common.collect.Sets
import com.intellij.codeInsight.TailType
import com.intellij.codeInsight.completion.InsertHandler import com.intellij.codeInsight.completion.InsertHandler
import com.intellij.codeInsight.completion.InsertionContext import com.intellij.codeInsight.completion.InsertionContext
import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.lookup.LookupElement
import com.intellij.psi.PsiElement
import com.intellij.psi.util.PsiTreeUtil import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.jet.lang.psi.JetFunction import org.jetbrains.jet.lang.psi.JetFunction
import org.jetbrains.jet.lang.psi.JetPsiUtil import org.jetbrains.jet.lang.psi.JetPsiUtil
@@ -54,7 +51,6 @@ public object KotlinKeywordInsertHandler : InsertHandler<LookupElement> {
} }
// Add space after keyword // Add space after keyword
context.setAddCompletionChar(false) WithTailInsertHandler.spaceTail().postHandleInsert(context, item)
TailType.SPACE.processTail(context.getEditor(), context.getTailOffset())
} }
} }
idea/src/org/jetbrains/jet/plugin/completion/handlers/WithTailInsertHandler.kt
+1
View File
@@ -90,5 +90,6 @@ class WithTailInsertHandler(val tailText: String,
fun rparenthTail() = WithTailInsertHandler(")", spaceBefore = false, spaceAfter = false) fun rparenthTail() = WithTailInsertHandler(")", spaceBefore = false, spaceAfter = false)
fun elseTail() = WithTailInsertHandler("else", spaceBefore = true, spaceAfter = true) fun elseTail() = WithTailInsertHandler("else", spaceBefore = true, spaceAfter = true)
fun eqTail() = WithTailInsertHandler("=", spaceBefore = true, spaceAfter = true) /*TODO: use code style options*/ fun eqTail() = WithTailInsertHandler("=", spaceBefore = true, spaceAfter = true) /*TODO: use code style options*/
fun spaceTail() = WithTailInsertHandler(" ", spaceBefore = false, spaceAfter = false)
} }
} }