@lvce-editor/quick-pick-worker 4.4.0 → 4.4.2

package/dist/quickPickWorkerMain.js

@@ -598,7 +598,10 @@ const constructError = (message, type, name) => {
   if (ErrorConstructor === Error) {
     const error = new Error(message);
     if (name && name !== 'VError') {
-      error.name = name;
+      Object.defineProperty(error, 'name', {
+        configurable: true,
+        value: name
+      });
     }
     return error;
   }
@@ -615,8 +618,10 @@ const getCurrentStack = () => {
   const currentStack = joinLines(splitLines$1(new Error().stack || '').slice(stackLinesToSkip));
   return currentStack;
 };
-const getNewLineIndex = (string, startIndex = undefined) => {
-  return string.indexOf(NewLine, startIndex);
+const getNewLineIndex = (string, startIndex) => {
+  {
+    return string.indexOf(NewLine);
+  }
 };
 const getParentStack = error => {
   let parentStack = error.stack || error.data || error.message || '';
@@ -627,55 +632,91 @@ const getParentStack = error => {
 };
 const MethodNotFound = -32601;
 const Custom$2 = -32001;
+const setStack = (error, stack) => {
+  const descriptor = Object.getOwnPropertyDescriptor(error, 'stack');
+  if (descriptor) {
+    if (!descriptor.configurable && !descriptor.writable) {
+      return;
+    }
+    if (!descriptor.configurable && descriptor.writable) {
+      error.stack = stack;
+      return;
+    }
+  }
+  Object.defineProperty(error, 'stack', {
+    configurable: true,
+    value: stack,
+    writable: true
+  });
+};
+const restoreExistingError = (error, currentStack) => {
+  if (typeof error.stack === 'string') {
+    setStack(error, `${error.stack}${NewLine}${currentStack}`);
+  }
+  return error;
+};
+const restoreMethodNotFoundError = (error, currentStack) => {
+  const restoredError = new JsonRpcError(error.message);
+  const parentStack = getParentStack(error);
+  setStack(restoredError, `${parentStack}${NewLine}${currentStack}`);
+  return restoredError;
+};
+const restoreStackFromData = (restoredError, error, currentStack) => {
+  if (error.data.stack && error.data.type && error.message) {
+    setStack(restoredError, `${error.data.type}: ${error.message}${NewLine}${error.data.stack}${NewLine}${currentStack}`);
+    return;
+  }
+  if (error.data.stack) {
+    setStack(restoredError, error.data.stack);
+  }
+};
+const applyDataProperties = (restoredError, error) => {
+  restoreStackFromData(restoredError, error, getCurrentStack());
+  if (error.data.codeFrame) {
+    // @ts-ignore
+    restoredError.codeFrame = error.data.codeFrame;
+  }
+  if (error.data.code) {
+    // @ts-ignore
+    restoredError.code = error.data.code;
+  }
+  if (error.data.type) {
+    // @ts-ignore
+    restoredError.name = error.data.type;
+  }
+};
+const applyDirectProperties = (restoredError, error) => {
+  if (error.stack) {
+    const lowerStack = restoredError.stack || '';
+    const indexNewLine = getNewLineIndex(lowerStack);
+    const parentStack = getParentStack(error);
+    // @ts-ignore
+    setStack(restoredError, `${parentStack}${lowerStack.slice(indexNewLine)}`);
+  }
+  if (error.codeFrame) {
+    // @ts-ignore
+    restoredError.codeFrame = error.codeFrame;
+  }
+};
+const restoreMessageError = (error, _currentStack) => {
+  const restoredError = constructError(error.message, error.type, error.name);
+  if (error.data) {
+    applyDataProperties(restoredError, error);
+  } else {
+    applyDirectProperties(restoredError, error);
+  }
+  return restoredError;
+};
 const restoreJsonRpcError = error => {
   const currentStack = getCurrentStack();
   if (error && error instanceof Error) {
-    if (typeof error.stack === 'string') {
-      error.stack = error.stack + NewLine + currentStack;
-    }
-    return error;
+    return restoreExistingError(error, currentStack);
   }
   if (error && error.code && error.code === MethodNotFound) {
-    const restoredError = new JsonRpcError(error.message);
-    const parentStack = getParentStack(error);
-    restoredError.stack = parentStack + NewLine + currentStack;
-    return restoredError;
+    return restoreMethodNotFoundError(error, currentStack);
   }
   if (error && error.message) {
-    const restoredError = constructError(error.message, error.type, error.name);
-    if (error.data) {
-      if (error.data.stack && error.data.type && error.message) {
-        restoredError.stack = error.data.type + ': ' + error.message + NewLine + error.data.stack + NewLine + currentStack;
-      } else if (error.data.stack) {
-        restoredError.stack = error.data.stack;
-      }
-      if (error.data.codeFrame) {
-        // @ts-ignore
-        restoredError.codeFrame = error.data.codeFrame;
-      }
-      if (error.data.code) {
-        // @ts-ignore
-        restoredError.code = error.data.code;
-      }
-      if (error.data.type) {
-        // @ts-ignore
-        restoredError.name = error.data.type;
-      }
-    } else {
-      if (error.stack) {
-        const lowerStack = restoredError.stack || '';
-        // @ts-ignore
-        const indexNewLine = getNewLineIndex(lowerStack);
-        const parentStack = getParentStack(error);
-        // @ts-ignore
-        restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
-      }
-      if (error.codeFrame) {
-        // @ts-ignore
-        restoredError.codeFrame = error.codeFrame;
-      }
-    }
-    return restoredError;
+    return restoreMessageError(error);
   }
   if (typeof error === 'string') {
     return new Error(`JsonRpc Error: ${error}`);
@@ -880,9 +921,9 @@ const create$a = (id, method, params) => {
   return message;
 };
 
-let id$2 = 0;
+let id = 0;
 const create$9 = () => {
-  return ++id$2;
+  return ++id;
 };
 
 const registerPromise = map => {
@@ -1135,13 +1176,6 @@ const create$4 = rpcId => {
   };
 };
 
-const Div = 4;
-const Input = 6;
-const Span = 8;
-const Text = 12;
-const Img = 17;
-const Reference = 100;
-
 const EditorWorker = 99;
 const ExtensionManagementWorker = 9006;
 const RendererWorker = 1;
@@ -1217,9 +1251,11 @@ const closeWidget = async id => {
   await closeWidget$1(id);
 };
 
-let id$1 = 0;
+const state$3 = {
+  value: 0
+};
 const create$3 = () => {
-  return ++id$1;
+  return ++state$3.value;
 };
 
 const callbacks$1 = Object.create(null);
@@ -1887,7 +1923,7 @@ const next = (items, index) => {
   return (index + 1) % items.length;
 };
 const previous = (items, index) => {
-  return index === 0 ? items.length - 1 : index - 1;
+  return (index === 0 ? items.length : index) - 1;
 };
 
 const focusFirst = state => {
@@ -2434,7 +2470,7 @@ const warn = (...args) => {
   console.warn(...args);
 };
 
-const state$1 = {
+const state$2 = {
   menuEntries: []
 };
 const getAll = async () => {
@@ -2445,10 +2481,10 @@ const getAll = async () => {
   } catch {
     // ignore
   }
-  return state$1.menuEntries;
+  return state$2.menuEntries;
 };
 const add$1 = menuEntries => {
-  state$1.menuEntries = [...state$1.menuEntries, ...menuEntries];
+  state$2.menuEntries = [...state$2.menuEntries, ...menuEntries];
 };
 
 const changeLanguageModePick = {
@@ -2519,30 +2555,34 @@ const getPicks$c = async (value, args, {
   return converted;
 };
 
-const state = {
+const state$1 = {
   args: [],
   items: Object.create(null)
 };
 
-let id = 0;
+const idState = {
+  value: 0
+};
 const add = items => {
-  const nextId = ++id;
-  state.items[nextId] = items;
+  const nextId = ++idState.value;
+  state$1.items[nextId] = items;
   return nextId;
 };
 const get = id => {
-  return state.items[id] || [];
+  return state$1.items[id] || [];
 };
 const remove = id => {
-  delete state.items[id];
+  delete state$1.items[id];
 };
 
-let rpc;
+const state = {
+  rpc: undefined
+};
 const set = newRpc => {
-  rpc = newRpc;
+  state.rpc = newRpc;
 };
 const invoke = (method, ...args) => {
-  return rpc.invoke(method, ...args);
+  return state.rpc.invoke(method, ...args);
 };
 
 const toProtoVisibleItem$2 = item => {
@@ -2563,9 +2603,14 @@ const toProtoVisibleItem$2 = item => {
   };
 };
 const getPicks$b = async (searchValue, args) => {
-  state.args = args;
+  state$1.args = args;
   const options = args.at(-1);
-  const items = options?.mode === 'quickInput' ? searchValue === '' && options?.customItemsId ? get(options.customItemsId) : await invoke('ExtensionHostQuickPick.renderQuickInput', options.quickInputId, searchValue) : options?.customItemsId ? get(options.customItemsId) : args[1] || [];
+  let items;
+  if (options?.mode === 'quickInput') {
+    items = searchValue === '' && options?.customItemsId ? get(options.customItemsId) : await invoke('ExtensionHostQuickPick.renderQuickInput', options.quickInputId, searchValue);
+  } else {
+    items = options?.customItemsId ? get(options.customItemsId) : args[1] || [];
+  }
   const mapped = items.map(toProtoVisibleItem$2);
   return mapped;
 };
@@ -2688,7 +2733,7 @@ const QuickOpen = 'Quick open';
 const SearchForText = 'Search for text';
 const ShowAndRunCommands = 'Show And Run Commands';
 const TypeNameOfCommandToRun = 'Type the name of a command to run.';
-const PressEnterToGoToLine = `Press 'Enter' to go to line {PH1} column {PH2}`;
+const PressEnterToGoToLine = "Press 'Enter' to go to line {PH1} column {PH2}";
 
 const pressEnterToGoToLine = (row, column) => {
   return i18nString(PressEnterToGoToLine, {
@@ -2730,7 +2775,7 @@ const getPicksGoToColumn = async value => {
   }
   if (value.startsWith(GoToColumn)) {
     const columnString = value.slice(GoToColumn.length);
-    const wantedColumn = Number.parseInt(columnString, 10);
+    const wantedColumn = Number(columnString);
     if (Number.isNaN(wantedColumn)) {
       return getPicksGoToColumnBase();
     }
@@ -2773,7 +2818,7 @@ const getPicksGoToLineBase = async () => {
 
 const parseGotoline = value => {
   const lineString = value.slice(GoToLine$1.length);
-  const wantedLine = Number.parseInt(lineString, 10);
+  const wantedLine = Number(lineString);
   if (Number.isNaN(wantedLine)) {
     return -1;
   }
@@ -2874,7 +2919,8 @@ const getIconName = language => {
   if (!extension) {
     return '';
   }
-  return `file${extension.startsWith('.') ? extension : `.${extension}`}`;
+  const normalizedExtension = extension.startsWith('.') ? extension : `.${extension}`;
+  return `file${normalizedExtension}`;
 };
 const toProtoVisibleItem$1 = language => {
   const iconName = getIconName(language);
@@ -3027,7 +3073,7 @@ const selectPickExtension = async item => {
     };
   }
   return {
-    command: KeepOpen
+    command: Hide
   };
 };
 const selectPick$9 = async item => {
@@ -3051,7 +3097,7 @@ const getOptions = args => {
 const selectPick$8 = async (_pick, value) => {
   const {
     args
-  } = state;
+  } = state$1;
   const options = getOptions(args);
   const resolveId = args[2];
   const result = options.mode === 'quickPick' ? _pick.value : {
@@ -3100,7 +3146,7 @@ const goToPositionAndFocus = async (rowIndex, columnIndex) => {
 const selectPickGoToColumn = async (item, value) => {
   if (value.startsWith(GoToColumn)) {
     const columnString = value.slice(2);
-    const wantedColumn = Number.parseInt(columnString, 10);
+    const wantedColumn = Number(columnString);
     const text = await getText();
     const position = getPosition(text, wantedColumn);
     await goToPositionAndFocus(position.row, position.column);
@@ -3116,7 +3162,7 @@ const selectPickGoToColumn = async (item, value) => {
 const selectPick$6 = async (item, value) => {
   if (value.startsWith(GoToLine$1)) {
     const lineString = value.slice(GoToLine$1.length);
-    const wantedLine = Number.parseInt(lineString, 10);
+    const wantedLine = Number(lineString);
     const rowIndex = wantedLine - 1;
     const columnIndex = 0;
     await goToPositionAndFocus(rowIndex, columnIndex);
@@ -3232,6 +3278,9 @@ const requestVersions = new Map();
 const requestVersionGenerator = {
   value: 0
 };
+const isSamePicker = (state, latestState) => {
+  return latestState.uri === state.uri && latestState.args === state.args;
+};
 const isQuickInput = args => {
   const options = args.at(-1);
   return options?.mode === 'quickInput';
@@ -3291,7 +3340,7 @@ const setValueWithContext = async (context, newValue) => {
   requestVersions.set(state.uid, requestVersion);
   const result = await setValue(state, newValue);
   await context.updateState(latestState => {
-    if (requestVersions.get(latestState.uid) !== requestVersion) {
+    if (requestVersions.get(latestState.uid) !== requestVersion || !isSamePicker(state, latestState)) {
       return latestState;
     }
     return {
@@ -3461,7 +3510,8 @@ const waitUntilVisible = () => {
   return promise;
 };
 const notifyVisible = () => {
-  const pendingCallbacks = callbacks.splice(0);
+  const pendingCallbacks = [...callbacks];
+  callbacks.length = 0;
   for (const callback of pendingCallbacks) {
     callback();
   }
@@ -3697,6 +3747,13 @@ const renderHeight = (_oldState, newState) => {
   return ['Viewlet.send', uid, /* method */SetItemsHeight, /* height */height];
 };
 
+const Div = 4;
+const Input = 6;
+const Span = 8;
+const Text = 12;
+const Img = 17;
+const Reference = 100;
+
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
@@ -4203,11 +4260,10 @@ const getHighlights = (sections, label) => {
     nodes.push(text(label));
   } else {
     for (const section of sections) {
+      labelDom.childCount++;
       if (section.highlighted) {
-        labelDom.childCount++;
         nodes.push(quickPickHighlight, text(section.text));
       } else {
-        labelDom.childCount++;
         nodes.push(text(section.text));
       }
     }
@@ -4317,7 +4373,7 @@ const getRootNodeCount = nodes => {
       count++;
     } else {
       const lastIndex = remainingChildCounts.length - 1;
-      remainingChildCounts[lastIndex] = remainingChildCounts[lastIndex] - 1;
+      remainingChildCounts[lastIndex] -= 1;
     }
     remainingChildCounts.push(node.childCount);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/quick-pick-worker",
-  "version": "4.4.0",
+  "version": "4.4.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lvce-editor/quick-pick-worker.git"