@lvce-editor/completion-worker 1.7.0 → 1.9.0

package/dist/completionWorkerMain.js

@@ -967,7 +967,79 @@ const WebWorkerRpcClient = {
   create: create$4
 };
 
-const create$2 = () => {
+const rpcs = Object.create(null);
+const set$a = (id, rpc) => {
+  rpcs[id] = rpc;
+};
+const get$1 = id => {
+  return rpcs[id];
+};
+
+/* eslint-disable  @typescript-eslint/explicit-function-return-type */
+
+const create$2 = rpcId => {
+  return {
+    // @ts-ignore
+    invoke(method, ...params) {
+      const rpc = get$1(rpcId);
+      // @ts-ignore
+      return rpc.invoke(method, ...params);
+    },
+    // @ts-ignore
+    invokeAndTransfer(method, ...params) {
+      const rpc = get$1(rpcId);
+      // @ts-ignore
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    set(rpc) {
+      set$a(rpcId, rpc);
+    }
+  };
+};
+const EditorWorker$1 = 99;
+const ExtensionHostWorker = 44;
+const {
+  invoke: invoke$9,
+  invokeAndTransfer: invokeAndTransfer$9,
+  set: set$9
+} = create$2(EditorWorker$1);
+const EditorWorker = {
+  __proto__: null,
+  invoke: invoke$9,
+  invokeAndTransfer: invokeAndTransfer$9,
+  set: set$9
+};
+const {
+  invoke: invoke$7,
+  set: set$7
+} = create$2(ExtensionHostWorker);
+const ExtensionHost = {
+  __proto__: null,
+  invoke: invoke$7,
+  set: set$7
+};
+
+const {
+  invoke: invoke$1,
+  set: set$2,
+  invokeAndTransfer
+} = EditorWorker;
+
+const FocusEditorCompletions = 9;
+const FocusEditorRename = 11;
+
+const Completion = 3;
+
+const close = async state => {
+  const {
+    editorUid
+  } = state;
+  // @ts-ignore
+  await invoke$1('Editor.closeWidget2', editorUid, Completion, 'Completions', FocusEditorCompletions);
+  return state;
+};
+
+const create$1 = () => {
   const states = Object.create(null);
   return {
     get(uid) {
@@ -1027,13 +1099,13 @@ const create$2 = () => {
 };
 
 const {
-  get: get$1,
-  set: set$2,
+  get,
+  set: set$1,
   wrapCommand,
   dispose: dispose$1
-} = create$2();
+} = create$1();
 
-const create$1 = (uid, x, y, width, height, editorUid, editorLanguageId) => {
+const create = (uid, x, y, width, height, editorUid, editorLanguageId) => {
   const state = {
     uid,
     items: [],
@@ -1056,7 +1128,7 @@ const create$1 = (uid, x, y, width, height, editorUid, editorLanguageId) => {
     editorUid,
     editorLanguageId
   };
-  set$2(uid, state, state);
+  set$1(uid, state, state);
 };
 
 const isEqual$4 = (oldState, newState) => {
@@ -1104,7 +1176,7 @@ const diff2 = uid => {
   const {
     oldState,
     newState
-  } = get$1(uid);
+  } = get(uid);
   const diffResult = diff(oldState, newState);
   return diffResult;
 };
@@ -1145,64 +1217,11 @@ const openDetails = async state => {
   return state;
 };
 
-const rpcs = Object.create(null);
-const set$a = (id, rpc) => {
-  rpcs[id] = rpc;
-};
-const get = id => {
-  return rpcs[id];
-};
-
-/* eslint-disable  @typescript-eslint/explicit-function-return-type */
-
-const create = rpcId => {
-  return {
-    // @ts-ignore
-    invoke(method, ...params) {
-      const rpc = get(rpcId);
-      // @ts-ignore
-      return rpc.invoke(method, ...params);
-    },
-    // @ts-ignore
-    invokeAndTransfer(method, ...params) {
-      const rpc = get(rpcId);
-      // @ts-ignore
-      return rpc.invokeAndTransfer(method, ...params);
-    },
-    set(rpc) {
-      set$a(rpcId, rpc);
-    }
-  };
-};
-const EditorWorker$1 = 99;
-const ExtensionHostWorker = 44;
-const {
-  invoke: invoke$9,
-  invokeAndTransfer: invokeAndTransfer$9,
-  set: set$9
-} = create(EditorWorker$1);
-const EditorWorker = {
-  __proto__: null,
-  invoke: invoke$9,
-  invokeAndTransfer: invokeAndTransfer$9,
-  set: set$9
-};
-const {
-  invoke: invoke$7,
-  set: set$7
-} = create(ExtensionHostWorker);
-const ExtensionHost = {
-  __proto__: null,
-  invoke: invoke$7,
-  set: set$7
+const applyEdit = async (editorUid, changes) => {
+  // @ts-ignore
+  await invoke$1('Editor.applyEdit2', editorUid, changes);
 };
 
-const {
-  invoke: invoke$1,
-  set: set$1,
-  invokeAndTransfer
-} = EditorWorker;
-
 const OnCompletion = 'onCompletion';
 
 const CompletionExecute = 'ExtensionHostCompletion.execute';
@@ -1279,6 +1298,16 @@ const resolveCompletion = async (editorUid, name, completionItem) => {
   }
 };
 
+const getLines = async editorUid => {
+  const lines = await invoke$1('Editor.getLines2', editorUid);
+  return lines;
+};
+
+const getSelections = async editorUid => {
+  const selections = await invoke$1('Editor.getSelections2', editorUid);
+  return selections;
+};
+
 const getSelectionPairs = (selections, i) => {
   const first = selections[i];
   const second = selections[i + 1];
@@ -1335,8 +1364,8 @@ const getEdits = async (editorUid, leadingWord, completionItem) => {
   const word = completionItem.label;
   const resolvedItem = await resolveCompletion(editorUid, word, completionItem);
   const inserted = resolvedItem ? resolvedItem.snippet : word;
-  const lines = await invoke$1('Editor.getLines2', editorUid);
-  const selections = await invoke$1('Editor.getSelections2', editorUid);
+  const lines = await getLines(editorUid);
+  const selections = await getSelections(editorUid);
   const [startRowIndex, startColumnIndex] = selections;
   const leadingWordLength = leadingWord.length;
   const replaceRange$1 = new Uint32Array([startRowIndex, startColumnIndex - leadingWordLength, startRowIndex, startColumnIndex]);
@@ -1344,22 +1373,14 @@ const getEdits = async (editorUid, leadingWord, completionItem) => {
   return changes;
 };
 
-const Completion = 3;
-
 const select = async (state, completionItem) => {
   const {
     editorUid,
     leadingWord
   } = state;
   const changes = await getEdits(editorUid, leadingWord, completionItem);
-  // @ts-ignore
-  await invoke$1('Editor.applyEdit2', editorUid, changes);
-  // @ts-ignore
-  await invoke$1('Editor.closeWidget2', editorUid, Completion, 'Completions');
-  // TODO remove completion widget from editor
-  return {
-    ...state
-  };
+  await applyEdit(editorUid, changes);
+  return close(state);
 };
 
 const selectIndex = async (state, index) => {
@@ -1391,6 +1412,7 @@ const getCommandIds = () => {
 };
 
 const Enter = 3;
+const Escape = 8;
 const Space$1 = 9;
 const End = 255;
 const Home = 12;
@@ -1399,9 +1421,6 @@ const DownArrow = 16;
 
 const CtrlCmd = 1 << 11 >>> 0;
 
-const FocusEditorCompletions = 9;
-const FocusEditorRename = 11;
-
 const getCommand = shortId => {
   return {
     command: 'Editor.executeWidgetCommand',
@@ -1433,6 +1452,10 @@ const getKeyBindings = () => {
     key: CtrlCmd | Space$1,
     ...getCommand('toggleDetails'),
     when: FocusEditorCompletions
+  }, {
+    key: Escape,
+    ...getCommand('close'),
+    when: FocusEditorCompletions
   }];
 };
 
@@ -1617,10 +1640,12 @@ const filterCompletionItems = (completionItems, word) => {
     if (result.length > 0) {
       if (flags & Deprecated) {
         // TODO avoid mutation
+        // @ts-ignore
         completionItem.matches = EmptyMatches;
         deprecated.push(completionItem);
       } else {
         // TODO avoid mutation
+        // @ts-ignore
         completionItem.matches = result;
         filteredCompletions.push(completionItem);
       }
@@ -2199,8 +2224,8 @@ const render2 = (uid, diffResult) => {
   const {
     oldState,
     newState
-  } = get$1(uid);
-  set$2(uid, newState, newState);
+  } = get(uid);
+  set$1(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
@@ -2210,7 +2235,8 @@ const terminate = () => {
 };
 
 const commandMap = {
-  'Completions.create': create$1,
+  'Completions.close': wrapCommand(close),
+  'Completions.create': create,
   'Completions.diff2': diff2,
   'Completions.dispose': dispose,
   'Completions.focusFirst': wrapCommand(focusFirst),
@@ -2224,18 +2250,18 @@ const commandMap = {
   'Completions.handleWheel': wrapCommand(handleWheel),
   'Completions.initialize': initialize,
   'Completions.loadContent': wrapCommand(loadContent),
+  'Completions.openDetails': wrapCommand(openDetails),
   'Completions.render2': render2,
   'Completions.selectCurrent': wrapCommand(selectCurrent),
   'Completions.selectIndex': wrapCommand(selectIndex),
-  'Completions.terminate': terminate,
-  'Completions.openDetails': wrapCommand(openDetails)
+  'Completions.terminate': terminate
 };
 
 const listen = async () => {
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
-  set$1(rpc);
+  set$2(rpc);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/completion-worker",
-  "version": "1.7.0",
+  "version": "1.9.0",
   "description": "Web Worker for the find widget in Lvce Editor",
   "repository": {
     "type": "git",