@lvce-editor/completion-worker 1.5.0 → 1.7.0

package/dist/completionWorkerMain.js

@@ -94,6 +94,12 @@ const number = value => {
     throw new AssertionError('expected value to be of type number');
   }
 };
+const string = value => {
+  const type = getType(value);
+  if (type !== 'string') {
+    throw new AssertionError('expected value to be of type string');
+  }
+};
 
 const isMessagePort = value => {
   return value && value instanceof MessagePort;
@@ -1023,7 +1029,8 @@ const create$2 = () => {
 const {
   get: get$1,
   set: set$2,
-  wrapCommand
+  wrapCommand,
+  dispose: dispose$1
 } = create$2();
 
 const create$1 = (uid, x, y, width, height, editorUid, editorLanguageId) => {
@@ -1102,6 +1109,10 @@ const diff2 = uid => {
   return diffResult;
 };
 
+const dispose = uid => {
+  dispose$1(uid);
+};
+
 const focusIndex = (state, index) => {
   const newState = {
     ...state,
@@ -1134,10 +1145,6 @@ const openDetails = async state => {
   return state;
 };
 
-const OnCompletion = 'onCompletion';
-
-const CompletionExecute = 'ExtensionHostCompletion.execute';
-
 const rpcs = Object.create(null);
 const set$a = (id, rpc) => {
   rpcs[id] = rpc;
@@ -1196,6 +1203,11 @@ const {
   invokeAndTransfer
 } = EditorWorker;
 
+const OnCompletion = 'onCompletion';
+
+const CompletionExecute = 'ExtensionHostCompletion.execute';
+const CompletionResolveExecute = 'ExtensionHostCompletion.executeResolve';
+
 // TODO add tests for this
 const activateByEvent = async event => {
   // @ts-ignore
@@ -1232,6 +1244,15 @@ const executeCompletionProvider = async (editorUid, editorLanguageId, offset) =>
     noProviderFoundMessage: 'no completion provider found',
     noProviderFoundResult: []});
 };
+const executeResolveCompletionItem = async (editorUid, offset, name, completionItem) => {
+  return execute({
+    editorUid,
+    event: OnCompletion,
+    method: CompletionResolveExecute,
+    args: [offset, name, completionItem],
+    noProviderFoundMessage: 'no completion provider found',
+    noProviderFoundResult: []});
+};
 
 const getOffsetAtCursor = editorUid => {
   // TODO ask editor worker
@@ -1245,29 +1266,102 @@ const getCompletions = async (editorUid, editorLanguageId) => {
   return completions;
 };
 
+// TODO don't send unnecessary parts of completion item like matches
+const resolveCompletion = async (editorUid, name, completionItem) => {
+  try {
+    string(name);
+    object(completionItem);
+    const offset = getOffsetAtCursor(editorUid);
+    const resolvedCompletionItem = await executeResolveCompletionItem(editorUid, offset, name, completionItem);
+    return resolvedCompletionItem;
+  } catch {
+    return undefined;
+  }
+};
+
+const getSelectionPairs = (selections, i) => {
+  const first = selections[i];
+  const second = selections[i + 1];
+  const third = selections[i + 2];
+  const fourth = selections[i + 3];
+  if (first > third || first === third && second >= fourth) {
+    return [third, fourth, first, second, 1];
+  }
+  return [first, second, third, fourth, 0];
+};
+
+const getSelectionText = (lines, range) => {
+  const startRowIndex = range.start.rowIndex;
+  const startColumnIndex = range.start.columnIndex;
+  const endRowIndex = Math.min(range.end.rowIndex, lines.length - 1);
+  const endColumnIndex = range.end.columnIndex;
+  if (startRowIndex === endRowIndex) {
+    return [lines[startRowIndex].slice(startColumnIndex, endColumnIndex)];
+  }
+  const selectedLines = [lines[startRowIndex].slice(startColumnIndex), ...lines.slice(startRowIndex + 1, endRowIndex), lines[endRowIndex].slice(0, endColumnIndex)];
+  return selectedLines;
+};
+
+// TODO add more exact types
+const replaceRange = (lines, ranges, replacement, origin) => {
+  const changes = [];
+  const rangesLength = ranges.length;
+  for (let i = 0; i < rangesLength; i += 4) {
+    const [selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn] = getSelectionPairs(ranges, i);
+    const start = {
+      rowIndex: selectionStartRow,
+      columnIndex: selectionStartColumn
+    };
+    const end = {
+      rowIndex: selectionEndRow,
+      columnIndex: selectionEndColumn
+    };
+    const selection = {
+      start,
+      end
+    };
+    changes.push({
+      start: start,
+      end: end,
+      inserted: replacement,
+      deleted: getSelectionText(lines, selection),
+      origin
+    });
+  }
+  return changes;
+};
+
+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 [startRowIndex, startColumnIndex] = selections;
+  const leadingWordLength = leadingWord.length;
+  const replaceRange$1 = new Uint32Array([startRowIndex, startColumnIndex - leadingWordLength, startRowIndex, startColumnIndex]);
+  const changes = replaceRange(lines, replaceRange$1, [inserted], '');
+  return changes;
+};
+
+const Completion = 3;
+
 const select = async (state, completionItem) => {
-  // TODO ask editor worker to apply changes and close completion widget
-  // const changes = await getEdits(state, completionItem)
-  // TODO ask editor worker to remove widget
-  // const index = state.widgets
-  //   .indexOf
-  //   // ViewletModuleId.EditorCompletion
-  //   ()
-  // if (index !== -1) {
-  //   state.widgets.splice(index, 1)
-  //   state.completionState = EditorCompletionState.None
-  //   state.completionUid = 0
-  // }
-  // // TODO dispose completion widget
-  // // TODO apply edit in editor worker instead of asking renderer worker
-  // // await RendererWorker.invoke('Viewlet.dispose', state.uid)
-  // const { widgets } = state
-  // const newWidgets = RemoveEditorWidget.removeEditorWidget(widgets, WidgetId.Completion)
-  // const intermediateEditor = await EditorCommandApplyEdit.applyEdit(state, changes)
+  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
   };
 };
+
 const selectIndex = async (state, index) => {
   const {
     items
@@ -1278,7 +1372,9 @@ const selectIndex = async (state, index) => {
   if (index > items.length) {
     throw new Error('index too large');
   }
-  return select(state);
+  const actualIndex = index;
+  const completionItem = items[actualIndex];
+  return select(state, completionItem);
 };
 
 const selectCurrent = state => {
@@ -1306,8 +1402,6 @@ const CtrlCmd = 1 << 11 >>> 0;
 const FocusEditorCompletions = 9;
 const FocusEditorRename = 11;
 
-const Completion = 3;
-
 const getCommand = shortId => {
   return {
     command: 'Editor.executeWidgetCommand',
@@ -2118,6 +2212,7 @@ const terminate = () => {
 const commandMap = {
   'Completions.create': create$1,
   'Completions.diff2': diff2,
+  'Completions.dispose': dispose,
   'Completions.focusFirst': wrapCommand(focusFirst),
   'Completions.focusIndex': wrapCommand(focusIndex),
   'Completions.focusNext': wrapCommand(focusNext),

package/package.json

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