@lvce-editor/file-search-worker 6.10.0 → 6.12.0

package/dist/fileSearchWorkerMain.js

@@ -1086,7 +1086,7 @@ const sendMessagePortToEditorWorker = async (port, rpcId) => {
   // @ts-ignore
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToEditorWorker', port, command, rpcId);
 };
-const setFocus$1 = key => {
+const setFocus = key => {
   return invoke$1('Focus.setFocus', key);
 };
 const getFileIcon = async options => {
@@ -1380,20 +1380,23 @@ const setColorTheme = id => {
 };
 
 const focusPick$1 = async pick => {
-  const label = pick.label;
-  await setColorTheme(/* colorThemeId */label);
+  const {
+    label
+  } = pick;
+  await setColorTheme(label);
 };
 
 const ColorTheme$1 = 0;
 const Commands$1 = 1;
 const Custom$1 = 2;
 const File$2 = 3;
-const GoToLine$2 = 4;
-const Help$2 = 5;
-const Recent$1 = 6;
-const Symbol$2 = 7;
-const View$3 = 8;
-const WorkspaceSymbol$2 = 9;
+const GoToColumn$1 = 4;
+const GoToLine$2 = 5;
+const Help$2 = 6;
+const Recent$1 = 7;
+const Symbol$2 = 8;
+const View$3 = 9;
+const WorkspaceSymbol$2 = 10;
 const EveryThing$1 = 100;
 
 const noop$1 = async () => {};
@@ -1960,6 +1963,7 @@ const GoToLine$1 = ':';
 const View$2 = 'view ';
 const None$1 = '';
 const Help$1 = '?';
+const GoToColumn = '::';
 
 const getQuickPickPrefix = value => {
   if (value.startsWith(Command)) {
@@ -1971,6 +1975,9 @@ const getQuickPickPrefix = value => {
   if (value.startsWith(WorkspaceSymbol$1)) {
     return WorkspaceSymbol$1;
   }
+  if (value.startsWith(GoToColumn)) {
+    return GoToColumn;
+  }
   if (value.startsWith(GoToLine$1)) {
     return GoToLine$1;
   }
@@ -1988,16 +1995,18 @@ const getFilterValueEverything = value => {
   const prefixLength = prefix.length;
   return value.slice(prefixLength).trim();
 };
+const getValueGoToColumn = value => {
+  return '';
+};
 const getValueGoToLine = value => {
-  if (value.startsWith('::')) {
-    return value.slice(2);
-  }
-  return value.slice(1);
+  return '';
 };
 const getFn$1 = id => {
   switch (id) {
     case EveryThing$1:
       return getFilterValueEverything;
+    case GoToColumn$1:
+      return getValueGoToColumn;
     case GoToLine$2:
       return getValueGoToLine;
     default:
@@ -2005,8 +2014,11 @@ const getFn$1 = id => {
   }
 };
 const getFilterValue = (id, subId, value) => {
+  if (subId === GoToColumn$1) {
+    return getValueGoToColumn();
+  }
   if (subId === GoToLine$2) {
-    return getValueGoToLine(value);
+    return getValueGoToLine();
   }
   const fn = getFn$1(id);
   const filterValue = fn(value);
@@ -2056,10 +2068,18 @@ const handleError = async (error, notify = true, prefix = '') => {
   console.error(error);
 };
 const showErrorDialog = async error => {
-  const code = error.code;
-  const message = error.message;
-  const stack = error.stack;
-  const name = error.name;
+  const {
+    code
+  } = error;
+  const {
+    message
+  } = error;
+  const {
+    stack
+  } = error;
+  const {
+    name
+  } = error;
   const errorInfo = {
     code,
     message,
@@ -2251,6 +2271,26 @@ const getPicks$9 = async searchValue => {
   return picks;
 };
 
+const getText = async () => {
+  // TODO
+  const id = await getActiveEditorId();
+  const lines = await getLines(id);
+  return lines.join('\n');
+};
+
+const getPicksGoToColumnBase = async () => {
+  const text = await getText();
+  return [{
+    description: '',
+    direntType: 0,
+    fileIcon: '',
+    icon: '',
+    label: `Type a character position to go to (from 1 to ${text.length})`,
+    matches: [],
+    uri: ''
+  }];
+};
+
 const getPosition = (text, wantedColumn) => {
   let row = 0;
   let column = 0;
@@ -2268,99 +2308,6 @@ const getPosition = (text, wantedColumn) => {
   };
 };
 
-const getText = async () => {
-  // TODO
-  const id = await getActiveEditorId();
-  const lines = await getLines(id);
-  return lines.join('\n');
-};
-
-const getPicks$8 = async value => {
-  if (value === '::') {
-    const text = await getText();
-    return [{
-      description: '',
-      direntType: 0,
-      fileIcon: '',
-      icon: '',
-      label: `Type a character position to go to (from 1 to ${text.length})`,
-      matches: [],
-      uri: ''
-    }];
-  }
-  if (value.startsWith('::')) {
-    const columnString = value.slice(2);
-    const wantedColumn = Number.parseInt(columnString, 10);
-    const text = await getText();
-    const position = getPosition(text, wantedColumn);
-    return [{
-      description: '',
-      direntType: 0,
-      fileIcon: '',
-      icon: '',
-      label: `Press 'Enter' to go to line ${position.row} column ${position.column}`,
-      matches: [],
-      uri: ''
-    }];
-  }
-  const picks = [{
-    description: '',
-    direntType: None$2,
-    fileIcon: '',
-    icon: '',
-    label: '1',
-    matches: [],
-    uri: ''
-  }, {
-    description: '',
-    direntType: None$2,
-    fileIcon: '',
-    icon: '',
-    label: '2',
-    matches: [],
-    uri: ''
-  }, {
-    description: '',
-    direntType: None$2,
-    fileIcon: '',
-    icon: '',
-    label: '3',
-    matches: [],
-    uri: ''
-  }, {
-    description: '',
-    direntType: None$2,
-    fileIcon: '',
-    icon: '',
-    label: '4',
-    matches: [],
-    uri: ''
-  }, {
-    description: '',
-    direntType: None$2,
-    fileIcon: '',
-    icon: '',
-    label: '5',
-    matches: [],
-    uri: ''
-  }, {
-    description: '',
-    direntType: None$2,
-    fileIcon: '',
-    icon: '',
-    label: '6',
-    matches: [],
-    uri: ''
-  }];
-  return picks;
-};
-
-const DotDotDot = '...';
-const Colon = ':';
-const Percent = '%';
-const AngleBracket = '>';
-const View$1 = 'view';
-
 const emptyObject = {};
 const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
 const i18nString = (key, placeholders = emptyObject) => {
@@ -2382,7 +2329,14 @@ 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 = (row, column) => {
+  return i18nString(PressEnterToGoToLine, {
+    PH1: row,
+    PH2: column
+  });
+};
 const typeNameofCommandToRun = () => {
   return i18nString(TypeNameOfCommandToRun);
 };
@@ -2411,6 +2365,84 @@ const openView = () => {
   return i18nString(OpenView);
 };
 
+const getPicksGoToColumn = async value => {
+  if (value === GoToColumn) {
+    return getPicksGoToColumnBase();
+  }
+  if (value.startsWith(GoToColumn)) {
+    const columnString = value.slice(GoToColumn.length);
+    const wantedColumn = Number.parseInt(columnString, 10);
+    if (Number.isNaN(wantedColumn)) {
+      return getPicksGoToColumnBase();
+    }
+    const text = await getText();
+    const position = getPosition(text, wantedColumn);
+    return [{
+      description: '',
+      direntType: 0,
+      fileIcon: '',
+      icon: '',
+      label: pressEnterToGoToLine(position.row, position.column),
+      matches: [],
+      uri: ''
+    }];
+  }
+  return [];
+};
+
+const splitLines = lines => {
+  if (!lines) {
+    return [];
+  }
+  return lines.split('\n');
+};
+
+const getPicksGoToLineBase = async () => {
+  const text = await getText();
+  const lines = splitLines(text);
+  const lineCount = lines.length;
+  return [{
+    description: '',
+    direntType: 0,
+    fileIcon: '',
+    icon: '',
+    label: `Type a line number to go to (from 1 to ${lineCount})`,
+    matches: [],
+    uri: ''
+  }];
+};
+
+const getPicks$8 = async value => {
+  if (value === GoToLine$1) {
+    return getPicksGoToLineBase();
+  }
+  if (value.startsWith(GoToLine$1)) {
+    const lineString = value.slice(GoToLine$1.length);
+    const wantedLine = Number.parseInt(lineString, 10);
+    if (Number.isNaN(wantedLine)) {
+      return getPicksGoToLineBase();
+    }
+    const rowIndex = wantedLine - 1;
+    const columnIndex = 0;
+    return [{
+      description: '',
+      direntType: 0,
+      fileIcon: '',
+      icon: '',
+      label: pressEnterToGoToLine(rowIndex, columnIndex),
+      matches: [],
+      uri: ''
+    }];
+  }
+  return [];
+};
+
+const DotDotDot = '...';
+const Colon = ':';
+const Percent = '%';
+const AngleBracket = '>';
+const View$1 = 'view';
+
 const getPicks$7 = async () => {
   return [{
     description: goToFile(),
@@ -2553,7 +2585,9 @@ const selectPickExtension = async item => {
 };
 const selectPick$8 = async item => {
   // @ts-ignore
-  const id = item.id;
+  const {
+    id
+  } = item;
   if (id.startsWith('ext.')) {
     return selectPickExtension(item);
   }
@@ -2580,7 +2614,9 @@ const openUri = async uri => {
 };
 
 const selectPick$6 = async pick => {
-  const description = pick.description;
+  const {
+    description
+  } = pick;
   const fileName = pick.label;
   const workspace = await getWorkspacePath();
   const absolutePath = `${workspace}/${description}/${fileName}`;
@@ -2599,8 +2635,8 @@ const goToPositionAndFocus = async (rowIndex, columnIndex) => {
   await invoke$1('Editor.handleFocus');
 };
 
-const selectPick$5 = async (item, value) => {
-  if (value.startsWith('::')) {
+const selectPickGoToColumn = async (item, value) => {
+  if (value.startsWith(GoToColumn)) {
     const columnString = value.slice(2);
     const wantedColumn = Number.parseInt(columnString, 10);
     const text = await getText();
@@ -2610,9 +2646,22 @@ const selectPick$5 = async (item, value) => {
       command: Hide
     };
   }
-  const rowIndex = Number.parseInt(item.label);
-  const columnIndex = 0;
-  await goToPositionAndFocus(rowIndex, columnIndex);
+  return {
+    command: Hide
+  };
+};
+
+const selectPick$5 = async (item, value) => {
+  if (value.startsWith(GoToLine$1)) {
+    const lineString = value.slice(GoToLine$1.length);
+    const wantedLine = Number.parseInt(lineString, 10);
+    const rowIndex = wantedLine - 1;
+    const columnIndex = 0;
+    await goToPositionAndFocus(rowIndex, columnIndex);
+    return {
+      command: Hide
+    };
+  }
   return {
     command: Hide
   };
@@ -2659,8 +2708,8 @@ const selectPick = async item => {
   };
 };
 
-const selectPicks = [selectPick$9, selectPick$8, selectPick$7, selectPick$6, selectPick$5, selectPick$4, selectPick$3, selectPick$2, selectPick$1, selectPick];
-const getPicks$2 = [getPicks$c, getPicks$b, getPicks$a, getPicks$9, getPicks$8, getPicks$7, getPicks$6, getPicks$5, getPicks$4, getPicks$3];
+const selectPicks = [selectPick$9, selectPick$8, selectPick$7, selectPick$6, selectPickGoToColumn, selectPick$5, selectPick$4, selectPick$3, selectPick$2, selectPick$1, selectPick];
+const getPicks$2 = [getPicks$c, getPicks$b, getPicks$a, getPicks$9, getPicksGoToColumn, getPicks$8, getPicks$7, getPicks$6, getPicks$5, getPicks$4, getPicks$3];
 
 const select = selectPicks;
 const getPick$1 = getPicks$2;
@@ -2685,6 +2734,8 @@ const getQuickPickSubProviderId = (id, prefix) => {
   switch (prefix) {
     case Command:
       return Commands$1;
+    case GoToColumn:
+      return GoToColumn$1;
     case GoToLine$1:
       return GoToLine$2;
     case Help$1:
@@ -2848,8 +2899,6 @@ const handleClickAt = (state, x, y) => {
   return selectIndex(state, index);
 };
 
-const setFocus = setFocus$1;
-
 const handleFocus = async state => {
   // TODO fix virtual dom diffing so that input isn't destroyed and loses focus when rerendering
   await setFocus(FocusQuickPickInput);
@@ -3488,13 +3537,6 @@ const invoke = (method, ...params) => {
   return invoke$1('SearchProcess.invoke', method, ...params);
 };
 
-const splitLines = lines => {
-  if (!lines) {
-    return [];
-  }
-  return lines.split('\n');
-};
-
 // TODO create direct connection from electron to file search worker using message ports
 
 const searchFile = async (path, value, prepare) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/file-search-worker",
-  "version": "6.10.0",
+  "version": "6.12.0",
   "keywords": [
     "text-search"
   ],