@lvce-editor/quick-pick-worker 4.17.2 → 4.18.1

package/dist/quickPickWorkerMain.js

@@ -1313,6 +1313,8 @@ const Symbol$3 = 8;
 const View$3 = 9;
 const WorkspaceSymbol$2 = 10;
 const LanguageMode$1 = 11;
+const EndOfLine$1 = 12;
+const Indentation$1 = 13;
 const EveryThing$1 = 100;
 
 const getCancelResult$1 = args => {
@@ -2433,7 +2435,7 @@ const toProtoVisibleItem$4 = name => {
   };
   return pick;
 };
-const getPicks$d = async (searchValue, args, {
+const getPicks$f = async (searchValue, args, {
   assetDir = '',
   platform = 0
 } = {}) => {
@@ -2569,7 +2571,7 @@ const toProtoVisibleItem$3 = item => {
   // @ts-ignore
   return pick;
 };
-const getPicks$c = async (value, args, {
+const getPicks$e = async (value, args, {
   assetDir = '',
   platform = 0
 } = {}) => {
@@ -2633,7 +2635,7 @@ const toProtoVisibleItem$2 = item => {
     value
   };
 };
-const getPicks$b = async (searchValue, args) => {
+const getPicks$d = async (searchValue, args) => {
   state$2.args = args;
   const options = args.at(-1);
   let items;
@@ -2646,6 +2648,20 @@ const getPicks$b = async (searchValue, args) => {
   return mapped;
 };
 
+const toPick$1 = (label, value) => ({
+  description: '',
+  direntType: 0,
+  fileIcon: '',
+  icon: '',
+  label,
+  matches: [],
+  uri: '',
+  value
+});
+const getPicks$c = async () => {
+  return [toPick$1('LF', 'lf'), toPick$1('CRLF', 'crlf')];
+};
+
 const emptyMatches = [];
 
 const getWorkspacePath = async () => {
@@ -2695,7 +2711,7 @@ const convertToPick = uri => {
 // e.g. when there are many files, don't need
 // to compute the fileIcon for all files
 
-const getPicks$a = async searchValue => {
+const getPicks$b = async searchValue => {
   // TODO cache workspace path
   const workspace = await getWorkspacePath();
   if (!workspace) {
@@ -2863,35 +2879,34 @@ const getPicksGoToLineBase = async () => {
   }];
 };
 
-const parseGotoline = value => {
-  const lineString = value.slice(GoToLine$1.length);
-  const wantedLine = Number(lineString);
-  if (Number.isNaN(wantedLine)) {
-    return -1;
-  }
-  if (wantedLine < 1) {
-    return -1;
+const parseGoToLinePosition = value => {
+  const [lineString, columnString = '1'] = value.slice(GoToLine$1.length).split(':');
+  const line = Number(lineString);
+  const column = Number(columnString);
+  if (!Number.isSafeInteger(line) || !Number.isSafeInteger(column) || line < 1 || column < 1) {
+    return undefined;
   }
-  return wantedLine;
+  return {
+    columnIndex: column - 1,
+    rowIndex: line - 1
+  };
 };
 
-const getPicks$9 = async value => {
+const getPicks$a = async value => {
   if (value === GoToLine$1) {
     return getPicksGoToLineBase();
   }
   if (value.startsWith(GoToLine$1)) {
-    const wantedLine = parseGotoline(value);
-    if (wantedLine === -1) {
+    const position = parseGoToLinePosition(value);
+    if (!position) {
       return getPicksGoToLineBase();
     }
-    const rowIndex = wantedLine - 1;
-    const columnIndex = 0;
     return [{
       description: '',
       direntType: 0,
       fileIcon: '',
       icon: '',
-      label: pressEnterToGoToLine(rowIndex, columnIndex),
+      label: pressEnterToGoToLine(position.rowIndex, position.columnIndex),
       matches: [],
       uri: ''
     }];
@@ -2905,7 +2920,7 @@ const Percent = '%';
 const AngleBracket = '>';
 const View$1 = 'view';
 
-const getPicks$8 = async () => {
+const getPicks$9 = async () => {
   return [{
     description: goToFile(),
     direntType: None$2,
@@ -2957,6 +2972,20 @@ const getPicks$8 = async () => {
   }];
 };
 
+const toPick = (label, value) => ({
+  description: '',
+  direntType: 0,
+  fileIcon: '',
+  icon: '',
+  label,
+  matches: [],
+  uri: '',
+  value
+});
+const getPicks$8 = async () => {
+  return [toPick('Indent Using Spaces', true), toPick('Indent Using Tabs', false)];
+};
+
 const getIconName = language => {
   const fileName = language.fileNames?.find(value => typeof value === 'string');
   if (fileName) {
@@ -3099,7 +3128,7 @@ const KeepOpen = '';
 const OpenColorTheme = 'open-color-theme';
 const OpenLanguageMode = 'open-language-mode';
 
-const selectPick$a = async pick => {
+const selectPick$c = async pick => {
   const id = pick.label;
   await setColorTheme(id);
   return {
@@ -3156,7 +3185,7 @@ const selectPickExtension = async item => {
     command: Hide
   };
 };
-const selectPick$9 = async item => {
+const selectPick$b = async item => {
   // @ts-ignore
   const {
     id
@@ -3174,7 +3203,7 @@ const getOptions = args => {
   }
   return last;
 };
-const selectPick$8 = async (_pick, value) => {
+const selectPick$a = async (_pick, value) => {
   const {
     args
   } = state$2;
@@ -3209,11 +3238,19 @@ const selectPick$8 = async (_pick, value) => {
   };
 };
 
+const selectPick$9 = async pick => {
+  const editorId = await getActiveEditorId();
+  await invoke$2('Viewlet.executeViewletCommand', editorId, 'setEndOfLine', pick.value);
+  return {
+    command: Hide
+  };
+};
+
 const openUri = async uri => {
   await openUri$1(uri);
 };
 
-const selectPick$7 = async pick => {
+const selectPick$8 = async pick => {
   const {
     description
   } = pick;
@@ -3251,13 +3288,12 @@ const selectPickGoToColumn = async (item, value) => {
   };
 };
 
-const selectPick$6 = async (item, value) => {
+const selectPick$7 = async (item, value) => {
   if (value.startsWith(GoToLine$1)) {
-    const lineString = value.slice(GoToLine$1.length);
-    const wantedLine = Number(lineString);
-    const rowIndex = wantedLine - 1;
-    const columnIndex = 0;
-    await goToPositionAndFocus(rowIndex, columnIndex);
+    const position = parseGoToLinePosition(value);
+    if (position) {
+      await goToPositionAndFocus(position.rowIndex, position.columnIndex);
+    }
     return {
       command: Hide
     };
@@ -3267,13 +3303,21 @@ const selectPick$6 = async (item, value) => {
   };
 };
 
-const selectPick$5 = async item => {
+const selectPick$6 = async item => {
   // Command.execute(/* openView */ 549, /* viewName */ item.label)
   return {
     command: Hide
   };
 };
 
+const selectPick$5 = async pick => {
+  const editorId = await getActiveEditorId();
+  await invoke$2('Viewlet.executeViewletCommand', editorId, 'setIndentation', pick.value);
+  return {
+    command: Hide
+  };
+};
+
 const selectPick$4 = async pick => {
   const editorId = await getActiveEditorId();
   const value = pick.value;
@@ -3318,8 +3362,8 @@ const selectPick = async item => {
   };
 };
 
-const selectPicks = [selectPick$a, selectPick$9, selectPick$8, selectPick$7, selectPickGoToColumn, selectPick$6, selectPick$5, selectPick$3, selectPick$2, selectPick$1, selectPick, selectPick$4];
-const getPicks$2 = [getPicks$d, getPicks$c, getPicks$b, getPicks$a, getPicksGoToColumn, getPicks$9, getPicks$8, getPicks$6, getPicks$5, getPicks$4, getPicks$3, getPicks$7];
+const selectPicks = [selectPick$c, selectPick$b, selectPick$a, selectPick$8, selectPickGoToColumn, selectPick$7, selectPick$6, selectPick$3, selectPick$2, selectPick$1, selectPick, selectPick$4, selectPick$9, selectPick$5];
+const getPicks$2 = [getPicks$f, getPicks$e, getPicks$d, getPicks$b, getPicksGoToColumn, getPicks$a, getPicks$9, getPicks$6, getPicks$5, getPicks$4, getPicks$3, getPicks$7, getPicks$c, getPicks$8];
 
 const select = selectPicks;
 const getPick$1 = getPicks$2;
@@ -3565,9 +3609,16 @@ const Help = 'quickPick://help';
 const WorkspaceSymbol = 'quickPick://workspace-symbol';
 const Custom = 'quickPick://custom';
 const GoToLine = 'quickPick://go-to-line';
+const EndOfLine = 'quickPick://end-of-line';
+const Indentation = 'quickPick://indentation';
 
-const getDefaultValue = (id, uri = '') => {
+const getDefaultValue = (id, uri = '', args = []) => {
   if (uri === GoToLine) {
+    const line = Number(args[1]);
+    const column = Number(args[2]);
+    if (Number.isSafeInteger(line) && Number.isSafeInteger(column) && line >= 1 && column >= 1) {
+      return `${GoToLine$1}${line}:${column}`;
+    }
     return GoToLine$1;
   }
   if (uri === WorkspaceSymbol) {
@@ -3595,6 +3646,10 @@ const getQuickPickProviderId = prefix => {
       return EveryThing$1;
     case Custom:
       return Custom$1;
+    case EndOfLine:
+      return EndOfLine$1;
+    case Indentation:
+      return Indentation$1;
     case LanguageMode:
       return LanguageMode$1;
     case Recent:
@@ -3658,7 +3713,7 @@ const getLoadedState = async state => {
     uri
   } = state;
   const id = getQuickPickProviderId(uri);
-  const value = getDefaultValue(id, uri);
+  const value = getDefaultValue(id, uri, args);
   const prefix = getQuickPickPrefix(value);
   const subId = getQuickPickSubProviderId(id, prefix);
   const newPicks = await getPicks(subId, value, args, {
@@ -4749,6 +4804,30 @@ const selectItem = async (state, label) => {
   return selectIndex(state, index);
 };
 
+const queues = new Map();
+const serialize = command => {
+  return async (uid, ...args) => {
+    const previous = queues.get(uid) || Promise.resolve();
+    const run = async () => {
+      try {
+        await previous;
+      } catch {
+        // The previous caller receives its error; later commands must still run.
+      }
+      await command(uid, ...args);
+    };
+    const current = run();
+    queues.set(uid, current);
+    try {
+      await current;
+    } finally {
+      if (queues.get(uid) === current) {
+        queues.delete(uid);
+      }
+    }
+  };
+};
+
 const showQuickInput = async ({
   id,
   ignoreFocusOut,
@@ -4827,7 +4906,7 @@ const commandMap = {
   'QuickPick.handleBlur': wrapCommand(handleBlur),
   'QuickPick.handleClickAt': wrapCommand(handleClickAt),
   'QuickPick.handleFocus': wrapCommand(handleFocus),
-  'QuickPick.handleInput': wrapAsyncCommand(handleInputWithContext),
+  'QuickPick.handleInput': serialize(wrapAsyncCommand(handleInputWithContext)),
   'QuickPick.handleMessagePort': handleMessagePort,
   'QuickPick.handleRendererProcessMessagePort': handleDirectMessagePort,
   'QuickPick.handleScrollBarPointerDown': wrapCommand(handleScrollBarPointerDown),
@@ -4838,7 +4917,7 @@ const commandMap = {
   'QuickPick.loadContent': wrapAsyncCommand(loadContentWithContext),
   'QuickPick.render2': render2,
   'QuickPick.renderEventListeners': renderEventListeners,
-  'QuickPick.selectCurrentIndex': wrapCommand(selectCurrentIndex),
+  'QuickPick.selectCurrentIndex': serialize(wrapCommand(selectCurrentIndex)),
   'QuickPick.selectIndex': wrapCommand(selectIndex),
   'QuickPick.selectItem': wrapCommand(selectItem),
   'QuickPick.setDeltaY': wrapCommand(setDeltaY),

package/package.json

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