Merge pull request #3214 from Injae-Lee/fix-cjk-overlapping

Fix #1287: CJK characters(korean) overlap each other in insert mode
VSCodeVim · Nov 24, 2018 · aebc42c · aebc42c
2 parents cafc606 + cddc149
commit aebc42c
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/extension.ts b/extension.ts
@@ -245,16 +245,21 @@ export async function activate(context: vscode.ExtensionContext) {
 
   overrideCommand(context, 'compositionStart', async () => {
     taskQueue.enqueueTask(async () => {
-      compositionState.isInComposition = true;
+      const mh = await getAndUpdateModeHandler();
+      if (mh.vimState.currentMode !== ModeName.Insert) {
+        compositionState.isInComposition = true;
+      }
     });
   });
 
   overrideCommand(context, 'compositionEnd', async () => {
     taskQueue.enqueueTask(async () => {
       const mh = await getAndUpdateModeHandler();
-      let text = compositionState.composingText;
-      compositionState.reset();
-      await mh.handleMultipleKeyEvents(text.split(''));
+      if (mh.vimState.currentMode !== ModeName.Insert) {
+        let text = compositionState.composingText;
+        compositionState.reset();
+        await mh.handleMultipleKeyEvents(text.split(''));
+      }
     });
   });