@lvce-editor/completion-worker 1.6.0 → 1.8.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,12 +1099,13 @@ const create$2 = () => {
 };
 
 const {
-  get: get$1,
-  set: set$2,
-  wrapCommand
-} = create$2();
+  get,
+  set: set$1,
+  wrapCommand,
+  dispose: dispose$1
+} = 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: [],
@@ -1055,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) => {
@@ -1103,11 +1176,15 @@ const diff2 = uid => {
   const {
     oldState,
     newState
-  } = get$1(uid);
+  } = get(uid);
   const diffResult = diff(oldState, newState);
   return diffResult;
 };
 
+const dispose = uid => {
+  dispose$1(uid);
+};
+
 const focusIndex = (state, index) => {
   const newState = {
     ...state,
@@ -1140,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';
@@ -1239,8 +1263,9 @@ const executeCompletionProvider = async (editorUid, editorLanguageId, offset) =>
     noProviderFoundMessage: 'no completion provider found',
     noProviderFoundResult: []});
 };
-const executeResolveCompletionItem = async (editor, offset, name, completionItem) => {
+const executeResolveCompletionItem = async (editorUid, offset, name, completionItem) => {
   return execute({
+    editorUid,
     event: OnCompletion,
     method: CompletionResolveExecute,
     args: [offset, name, completionItem],
@@ -1266,8 +1291,7 @@ const resolveCompletion = async (editorUid, name, completionItem) => {
     string(name);
     object(completionItem);
     const offset = getOffsetAtCursor(editorUid);
-    // @ts-ignore
-    const resolvedCompletionItem = await executeResolveCompletionItem(editor, offset, name, completionItem);
+    const resolvedCompletionItem = await executeResolveCompletionItem(editorUid, offset, name, completionItem);
     return resolvedCompletionItem;
   } catch {
     return undefined;
@@ -1345,12 +1369,8 @@ const select = async (state, completionItem) => {
     leadingWord
   } = state;
   const changes = await getEdits(editorUid, leadingWord, completionItem);
-  // @ts-ignore
-  await invoke$1('Editor.applyEdit2', editorUid, changes);
-  // TODO remove completion widget from editor
-  return {
-    ...state
-  };
+  await applyEdit(editorUid, changes);
+  return close(state);
 };
 
 const selectIndex = async (state, index) => {
@@ -1382,6 +1402,7 @@ const getCommandIds = () => {
 };
 
 const Enter = 3;
+const Escape = 8;
 const Space$1 = 9;
 const End = 255;
 const Home = 12;
@@ -1390,11 +1411,6 @@ const DownArrow = 16;
 
 const CtrlCmd = 1 << 11 >>> 0;
 
-const FocusEditorCompletions = 9;
-const FocusEditorRename = 11;
-
-const Completion = 3;
-
 const getCommand = shortId => {
   return {
     command: 'Editor.executeWidgetCommand',
@@ -1426,6 +1442,10 @@ const getKeyBindings = () => {
     key: CtrlCmd | Space$1,
     ...getCommand('toggleDetails'),
     when: FocusEditorCompletions
+  }, {
+    key: Escape,
+    ...getCommand('close'),
+    when: FocusEditorCompletions
   }];
 };
 
@@ -2192,8 +2212,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;
 };
@@ -2203,8 +2223,10 @@ 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),
   'Completions.focusIndex': wrapCommand(focusIndex),
   'Completions.focusNext': wrapCommand(focusNext),
@@ -2216,18 +2238,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.6.0",
+  "version": "1.8.0",
   "description": "Web Worker for the find widget in Lvce Editor",
   "repository": {
     "type": "git",