From c104aba03d5238326665e882e3c9c1faeaf26ca7 Mon Sep 17 00:00:00 2001 From: spikefu Date: Tue, 3 Apr 2012 05:19:15 -0700 Subject: [PATCH] Fix for KT-1403 - Code completion for keywords when replacing another keyword should not double spaces --- .../completion/handlers/JetKeywordInsertHandler.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetKeywordInsertHandler.java b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetKeywordInsertHandler.java index e14eeba1121..0d5b1526cd6 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetKeywordInsertHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetKeywordInsertHandler.java @@ -17,6 +17,7 @@ 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.InsertionContext; import com.intellij.codeInsight.lookup.LookupElement; @@ -39,12 +40,11 @@ public class JetKeywordInsertHandler implements InsertHandler { // Add space after keyword if (!NO_SPACE_AFTER.contains(keyword)) { Editor editor = context.getEditor(); - Document document = editor.getDocument(); - int offset = context.getStartOffset() + keyword.length(); context.setAddCompletionChar(false); - document.insertString(offset, " "); - editor.getCaretModel().moveToOffset(editor.getCaretModel().getOffset() + 1); + final TailType tailType = TailType.SPACE; + tailType.processTail(context.getEditor(), context.getTailOffset()); + editor.getCaretModel().moveToOffset(editor.getCaretModel().getOffset()); } } }