Fix a few bugs related to "insert as text" command (#240)

tadashi-aikawa · Aug 26, 2023 · e030f45 · e030f45
1 parent 0f85afc
commit e030f45
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/ui/AutoCompleteSuggest.ts b/src/ui/AutoCompleteSuggest.ts
@@ -517,7 +517,7 @@ export class AutoCompleteSuggest
     this.settings.hotkeys["insert as text"].forEach((hk) => {
       this.keymapEventHandler.push(
         this.scope.register(hk.modifiers, hk.key, (evt) =>
-          commands.insertAsText(this)
+          commands.insertAsText(this, evt)
         )
       );
     });

diff --git a/src/ui/popup-commands.ts b/src/ui/popup-commands.ts
@@ -19,11 +19,19 @@ export function select(
   }
 }
 
-export function insertAsText(popup: AutoCompleteSuggest): CommandReturnType {
-  if (!popup.context) {
+export function insertAsText(
+  popup: AutoCompleteSuggest,
+  evt: KeyboardEvent
+): CommandReturnType {
+  if (!popup.context || evt.isComposing) {
     return;
   }
 
+  if (popup.selectionLock) {
+    popup.close();
+    return true;
+  }
+
   const item = popup.suggestions.values[popup.suggestions.selectedItem];
   const editor = popup.context.editor;
   editor.replaceRange(
@@ -34,6 +42,8 @@ export function insertAsText(popup: AutoCompleteSuggest): CommandReturnType {
     },
     popup.context.end
   );
+
+  return false;
 }
 
 export function selectNext(