Merge branch 'master' of https://github.com/spikefu/kotlin
This commit is contained in:
@@ -17,6 +17,7 @@
|
|||||||
package org.jetbrains.jet.plugin.completion.handlers;
|
package org.jetbrains.jet.plugin.completion.handlers;
|
||||||
|
|
||||||
import com.google.common.collect.Sets;
|
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;
|
||||||
@@ -39,12 +40,11 @@ public class JetKeywordInsertHandler implements InsertHandler<LookupElement> {
|
|||||||
// Add space after keyword
|
// Add space after keyword
|
||||||
if (!NO_SPACE_AFTER.contains(keyword)) {
|
if (!NO_SPACE_AFTER.contains(keyword)) {
|
||||||
Editor editor = context.getEditor();
|
Editor editor = context.getEditor();
|
||||||
Document document = editor.getDocument();
|
|
||||||
|
|
||||||
int offset = context.getStartOffset() + keyword.length();
|
|
||||||
context.setAddCompletionChar(false);
|
context.setAddCompletionChar(false);
|
||||||
document.insertString(offset, " ");
|
final TailType tailType = TailType.SPACE;
|
||||||
editor.getCaretModel().moveToOffset(editor.getCaretModel().getOffset() + 1);
|
tailType.processTail(context.getEditor(), context.getTailOffset());
|
||||||
|
editor.getCaretModel().moveToOffset(editor.getCaretModel().getOffset());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user