@lvce-editor/completion-worker 1.14.0 → 1.15.0

package/dist/completionWorkerMain.js

@@ -611,6 +611,16 @@ const constructError = (message, type, name) => {
   }
   return new ErrorConstructor(message);
 };
+const joinLines = lines => {
+  return lines.join(NewLine);
+};
+const splitLines = lines => {
+  return lines.split(NewLine);
+};
+const getCurrentStack = () => {
+  const currentStack = joinLines(splitLines(new Error().stack || '').slice(2));
+  return currentStack;
+};
 const getNewLineIndex = (string, startIndex = undefined) => {
   return string.indexOf(NewLine, startIndex);
 };
@@ -621,19 +631,16 @@ const getParentStack = error => {
   }
   return parentStack;
 };
-const joinLines = lines => {
-  return lines.join(NewLine);
-};
 const MethodNotFound = -32601;
 const Custom = -32001;
-const splitLines = lines => {
-  return lines.split(NewLine);
-};
 const restoreJsonRpcError = error => {
+  const currentStack = getCurrentStack();
   if (error && error instanceof Error) {
+    if (typeof error.stack === 'string') {
+      error.stack = error.stack + NewLine + currentStack;
+    }
     return error;
   }
-  const currentStack = joinLines(splitLines(new Error().stack || '').slice(1));
   if (error && error.code && error.code === MethodNotFound) {
     const restoredError = new JsonRpcError(error.message);
     const parentStack = getParentStack(error);
@@ -714,6 +721,17 @@ const getErrorType = prettyError => {
   }
   return undefined;
 };
+const isAlreadyStack = line => {
+  return line.trim().startsWith('at ');
+};
+const getStack = prettyError => {
+  const stackString = prettyError.stack || '';
+  const newLineIndex = stackString.indexOf('\n');
+  if (newLineIndex !== -1 && !isAlreadyStack(stackString.slice(0, newLineIndex))) {
+    return stackString.slice(newLineIndex + 1);
+  }
+  return stackString;
+};
 const getErrorProperty = (error, prettyError) => {
   if (error && error.code === E_COMMAND_NOT_FOUND) {
     return {
@@ -726,7 +744,7 @@ const getErrorProperty = (error, prettyError) => {
     code: Custom,
     message: prettyError.message,
     data: {
-      stack: prettyError.stack,
+      stack: getStack(prettyError),
       codeFrame: prettyError.codeFrame,
       type: getErrorType(prettyError),
       code: prettyError.code,
@@ -968,7 +986,7 @@ const WebWorkerRpcClient = {
 };
 
 const rpcs = Object.create(null);
-const set$a = (id, rpc) => {
+const set$b = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -992,22 +1010,22 @@ const create$2 = rpcId => {
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$a(rpcId, rpc);
+      set$b(rpcId, rpc);
     }
   };
 };
 const EditorWorker$1 = 99;
 const ExtensionHostWorker = 44;
 const {
-  invoke: invoke$9,
-  invokeAndTransfer: invokeAndTransfer$9,
-  set: set$9
+  invoke: invoke$a,
+  invokeAndTransfer: invokeAndTransfer$a,
+  set: set$a
 } = create$2(EditorWorker$1);
 const EditorWorker = {
   __proto__: null,
-  invoke: invoke$9,
-  invokeAndTransfer: invokeAndTransfer$9,
-  set: set$9
+  invoke: invoke$a,
+  invokeAndTransfer: invokeAndTransfer$a,
+  set: set$a
 };
 const {
   invoke: invoke$7,
@@ -1223,6 +1241,68 @@ const applyEdit = async (editorUid, changes) => {
   await invoke$1('Editor.applyEdit2', editorUid, changes);
 };
 
+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];
+  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 OnCompletion = 'onCompletion';
 
 const CompletionExecute = 'ExtensionHostCompletion.execute';
@@ -1279,13 +1359,6 @@ const getOffsetAtCursor = editorUid => {
   return 0;
 };
 
-// TODO possible to do this with events/state machine instead of promises -> enables canceling operations / concurrent calls
-const getCompletions = async (editorUid, editorLanguageId) => {
-  const offset = getOffsetAtCursor();
-  const completions = await executeCompletionProvider(editorUid, editorLanguageId, offset);
-  return completions;
-};
-
 // TODO don't send unnecessary parts of completion item like matches
 const resolveCompletion = async (editorUid, name, completionItem) => {
   try {
@@ -1299,68 +1372,6 @@ 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];
-  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);
@@ -1859,6 +1870,24 @@ const initialize = async () => {
   set(rpc);
 };
 
+const error = message => {
+  // TODO send this to error worker for logging
+  console.error(message);
+};
+
+// TODO possible to do this with events/state machine instead of promises -> enables canceling operations / concurrent calls
+const getCompletions = async (editorUid, editorLanguageId) => {
+  try {
+    const offset = getOffsetAtCursor(editorUid);
+    const completions = await executeCompletionProvider(editorUid, editorLanguageId, offset);
+    return completions;
+  } catch (error$1) {
+    error(`Failed to get completions:`);
+    error(error$1);
+    return [];
+  }
+};
+
 const getFinalDeltaY = (height, itemHeight, itemsLength) => {
   const contentHeight = itemsLength * itemHeight;
   const finalDeltaY = Math.max(contentHeight - height, 0);
@@ -2237,7 +2266,7 @@ const getHighlights = item => {
 };
 
 const getLabel = item => {
-  return item.label;
+  return item.label || '';
 };
 
 const getTop = (i, minLineY, itemHeight, relative) => {
@@ -2270,9 +2299,15 @@ const renderItems = (oldState, newState) => {
   const {
     uid,
     height,
-    deltaY
+    deltaY,
+    items,
+    itemHeight,
+    leadingWord,
+    minLineY,
+    maxLineY,
+    focusedIndex
   } = newState;
-  const visibleItems = getVisibleItems(newState.items, newState.itemHeight, newState.leadingWord, newState.minLineY, newState.maxLineY, newState.focusedIndex, newState.deltaY);
+  const visibleItems = getVisibleItems(items, itemHeight, leadingWord, minLineY, maxLineY, focusedIndex, deltaY);
   const contentHeight = newState.items.length * newState.itemHeight;
   const scrollBarHeight = getScrollBarSize(height, contentHeight, 20);
   const scrollBarTop = getScrollBarTop(height, contentHeight, deltaY);

package/package.json

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