@lvce-editor/file-search-worker 5.8.0 → 5.9.0

package/dist/fileSearchWorkerMain.js

@@ -1083,23 +1083,22 @@ const focusPick$1 = async pick => {
   await setColorTheme(/* colorThemeId */label);
 };
 
-const CommandPalette = 'quickPick://commandPalette';
-const Commands = 'quickPick://commands';
-const File$2 = 'quickPick://file';
-const EveryThing = 'quickPick://everything';
-const Recent = 'quickPick://recent';
-const ColorTheme = 'quickPick://color-theme';
-const Symbol$1 = 'quickPick://symbol';
-const View$1 = 'quickPick://view';
-const WorkspaceSymbol$1 = 'quickPick://workspace-symbol';
-const Custom = 'quickPick://custom';
-const GoToLine$1 = 'quickPick://go-to-line';
-const Noop = 'quickPick://noop';
+const ColorTheme$1 = 0;
+const Commands$1 = 2;
+const Custom = 3;
+const EveryThing$1 = 4;
+const File$2 = 5;
+const GoToLine$2 = 6;
+const Help$2 = 7;
+const Recent$1 = 8;
+const Symbol$2 = 9;
+const View$3 = 10;
+const WorkspaceSymbol$2 = 11;
 
 const noop$2 = async () => {};
 const getFn$2 = id => {
   switch (id) {
-    case ColorTheme:
+    case ColorTheme$1:
       return focusPick$1;
     default:
       return noop$2;
@@ -1191,14 +1190,14 @@ const getQuickPickFileIcons = async (items, fileIconCache) => {
 
 const focusIndex = async (state, index) => {
   const {
-    uri,
+    providerId,
     maxVisibleItems,
     items,
     minLineY,
     maxLineY,
     fileIconCache
   } = state;
-  await focusPick(uri, items[index]);
+  await focusPick(providerId, items[index]);
   if (index < minLineY + 1) {
     const minLineY = index;
     const maxLineY = Math.min(index + maxVisibleItems, items.length - 1);
@@ -1662,27 +1661,28 @@ const filterQuickPickItems = (items, value) => {
 };
 
 const Command = '>';
-const Symbol = '@';
-const WorkspaceSymbol = '#';
-const GoToLine = ':';
-const View = 'view ';
+const Symbol$1 = '@';
+const WorkspaceSymbol$1 = '#';
+const GoToLine$1 = ':';
+const View$2 = 'view ';
 const None$1 = '';
+const Help$1 = '?';
 
 const getQuickPickPrefix = value => {
   if (value.startsWith(Command)) {
     return Command;
   }
-  if (value.startsWith(Symbol)) {
-    return Symbol;
+  if (value.startsWith(Symbol$1)) {
+    return Symbol$1;
   }
-  if (value.startsWith(WorkspaceSymbol)) {
-    return WorkspaceSymbol;
+  if (value.startsWith(WorkspaceSymbol$1)) {
+    return WorkspaceSymbol$1;
   }
-  if (value.startsWith(GoToLine)) {
-    return GoToLine;
+  if (value.startsWith(GoToLine$1)) {
+    return GoToLine$1;
   }
-  if (value.startsWith(View)) {
-    return View;
+  if (value.startsWith(View$2)) {
+    return View$2;
   }
   return None$1;
 };
@@ -1697,7 +1697,7 @@ const getFilterValueEverything = value => {
 };
 const getFn$1 = id => {
   switch (id) {
-    case EveryThing:
+    case EveryThing$1:
       return getFilterValueEverything;
     default:
       return noop$1;
@@ -1717,7 +1717,7 @@ const registerSelect = modules => {
 const registerGetPick = modules => {
   Object.assign(getPick$1, modules);
 };
-const getPicks$c = id => {
+const getPicks$d = id => {
   const fn = getPick$1[id];
   return fn;
 };
@@ -1726,16 +1726,35 @@ const getSelect = id => {
   return fn;
 };
 
-const getPicks$b = (id, searchValue) => {
-  const fn = getPicks$c(id);
+const getPicks$c = (id, searchValue) => {
+  const fn = getPicks$d(id);
   return fn(searchValue);
 };
 
+const getQuickPickSubProviderId = prefix => {
+  switch (prefix) {
+    case Command:
+      return Commands$1;
+    case Symbol$1:
+      return Symbol$2;
+    case WorkspaceSymbol$1:
+      return WorkspaceSymbol$2;
+    case GoToLine$1:
+      return GoToLine$2;
+    case View$2:
+      return View$3;
+    case Help$1:
+      return Help$2;
+    default:
+      return File$2;
+  }
+};
+
 // TODO when user types letters -> no need to query provider again -> just filter existing results
 const setValue = async (state, newValue) => {
   const {
+    providerId,
     value,
-    uri,
     minLineY,
     maxLineY,
     fileIconCache
@@ -1743,8 +1762,10 @@ const setValue = async (state, newValue) => {
   if (value === newValue) {
     return state;
   }
-  const newPicks = await getPicks$b(uri, newValue);
-  const filterValue = getFilterValue(uri, newValue);
+  const prefix = getQuickPickPrefix(newValue);
+  const subId = getQuickPickSubProviderId(prefix);
+  const newPicks = await getPicks$c(subId, newValue);
+  const filterValue = getFilterValue(providerId, newValue);
   const items = filterQuickPickItems(newPicks, filterValue);
   const focusedIndex = items.length === 0 ? -1 : 0;
   const sliced = items.slice(minLineY, maxLineY);
@@ -1817,15 +1838,17 @@ const KeepOpen = '';
 const selectIndex = async (state, index, button = /* left */0) => {
   const {
     minLineY,
-    uri,
-    items
+    items,
+    value
   } = state;
   const actualIndex = index + minLineY;
   const pick = getPick(items, actualIndex);
   if (!pick) {
     return state;
   }
-  const fn = getSelect(uri);
+  const prefix = getQuickPickPrefix(value);
+  const subId = getQuickPickSubProviderId(prefix);
+  const fn = getSelect(subId);
   const selectPickResult = await fn(pick);
   object(selectPickResult);
   string(selectPickResult.command);
@@ -1873,15 +1896,44 @@ const handleFocus = async state => {
   return state;
 };
 
-const getDefaultValue = uri => {
-  switch (uri) {
-    case 'quickPick://everything':
-      return '>';
+const getDefaultValue = id => {
+  switch (id) {
+    case EveryThing$1:
+      return Command;
     default:
       return '';
   }
 };
 
+const Commands = 'quickPick://commands';
+const EveryThing = 'quickPick://everything';
+const Recent = 'quickPick://recent';
+const ColorTheme = 'quickPick://color-theme';
+const Symbol = 'quickPick://symbol';
+const View$1 = 'quickPick://view';
+const Help = 'quickPick://help';
+const WorkspaceSymbol = 'quickPick://workspace-symbol';
+const GoToLine = 'quickPick://go-to-line';
+
+const getQuickPickProviderId = prefix => {
+  switch (prefix) {
+    case Commands:
+    case Symbol:
+    case WorkspaceSymbol:
+    case EveryThing:
+    case GoToLine:
+    case View$1:
+    case Help:
+      return EveryThing$1;
+    case ColorTheme:
+      return ColorTheme$1;
+    case Recent:
+      return Recent$1;
+    default:
+      return File$2;
+  }
+};
+
 const state$3 = {
   args: []
 };
@@ -1909,11 +1961,14 @@ const loadContent = async state => {
     args,
     fileIconCache
   } = state;
-  const value = getDefaultValue(uri);
-  setArgs(uri, args);
-  const newPicks = await getPicks$b(uri, value);
+  const id = getQuickPickProviderId(uri);
+  const value = getDefaultValue(id);
+  const prefix = getQuickPickPrefix(value);
+  const subId = getQuickPickSubProviderId(prefix);
+  setArgs(subId, args);
+  const newPicks = await getPicks$c(subId, value);
   array(newPicks);
-  const filterValue = getFilterValue(uri, value);
+  const filterValue = getFilterValue(id, value);
   const items = filterQuickPickItems(newPicks, filterValue);
   const minLineY = 0;
   const maxLineY = Math.min(minLineY + state.maxVisibleItems, newPicks.length);
@@ -1935,7 +1990,8 @@ const loadContent = async state => {
     inputSource: Script,
     focused: true,
     fileIconCache: newFileIconCache,
-    icons
+    icons,
+    providerId: id
   };
 };
 
@@ -1960,13 +2016,51 @@ const getVisible$1 = (items, minLineY, maxLineY, icons) => {
   return protoVisibleItems;
 };
 
+const emptyHighlightSections = [];
+
+const getHighlightSections = (highlights, label) => {
+  if (highlights.length === 0) {
+    return emptyHighlightSections;
+  }
+  const sections = [];
+  let position = 0;
+  for (let i = 0; i < highlights.length; i += 2) {
+    const highlightStart = highlights[i];
+    const highlightEnd = highlights[i + 1];
+    if (position < highlightStart) {
+      const beforeText = label.slice(position, highlightStart);
+      sections.push({
+        highlighted: false,
+        text: beforeText
+      });
+    }
+    const highlightText = label.slice(highlightStart, highlightEnd);
+    sections.push({
+      highlighted: true,
+      text: highlightText
+    });
+    position = highlightEnd;
+  }
+  if (position < label.length) {
+    const afterText = label.slice(position);
+    sections.push({
+      highlighted: false,
+      text: afterText
+    });
+  }
+  return sections;
+};
+
 const getVisible = (setSize, protoVisibleItems, minLineY, focusedIndex) => {
   const visibleItems = protoVisibleItems.map((visibleItem, i) => {
+    const highlights = visibleItem.matches.slice(1);
+    const sections = getHighlightSections(highlights, visibleItem.label);
     return {
       ...visibleItem,
       posInSet: minLineY + i + 1,
       setSize,
-      isActive: i === focusedIndex
+      isActive: i === focusedIndex,
+      highlights: sections
     };
   });
   return visibleItems;
@@ -2026,6 +2120,7 @@ const Option = 'option';
 const FileIcon = 'FileIcon';
 const InputBox = 'InputBox';
 const Label = 'Label';
+const MaskIcon = 'MaskIcon';
 const QuickPick$1 = 'QuickPick';
 const QuickPickHeader = 'QuickPickHeader';
 const QuickPickHighlight = 'QuickPickHighlight';
@@ -2033,9 +2128,9 @@ const QuickPickItem = 'QuickPickItem';
 const QuickPickItemActive$1 = 'QuickPickItemActive';
 const QuickPickItemDescription = 'QuickPickItemDescription';
 const QuickPickItemLabel = 'QuickPickItemLabel';
-const QuickPickMaskIcon = 'QuickPickMaskIcon';
 const QuickPickItems$1 = 'QuickPickItems';
-const MaskIcon = 'MaskIcon';
+const QuickPickMaskIcon = 'QuickPickMaskIcon';
+const QuickPickStatus = 'QuickPickStatus';
 const Viewlet = 'Viewlet';
 
 const HandleBeforeInput = 'handleBeforeInput';
@@ -2061,19 +2156,43 @@ const i18nString = (key, placeholders = emptyObject) => {
   return key.replaceAll(RE_PLACEHOLDER, replacer);
 };
 
+const GoToFile = 'Go to file';
+const GoToLineColumn = 'Go to Line / Column';
+const GoToSymbolInEditor = 'Go to Symbol in Editor';
 const NoResults = 'No Results';
-const TypeNameOfCommandToRun = 'Type the name of a command to run.';
+const OpenView = 'Open View';
 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 typeNameofCommandToRun = () => {
   return i18nString(TypeNameOfCommandToRun);
 };
+const showAndRunCommands = () => {
+  return i18nString(ShowAndRunCommands);
+};
+const goToFile = () => {
+  return i18nString(GoToFile);
+};
 const noResults = () => {
   return i18nString(NoResults);
 };
 const quickOpen = () => {
   return i18nString(QuickOpen);
 };
+const goToLineColumn = () => {
+  return i18nString(GoToLineColumn);
+};
+const goToSymbolInEditor = () => {
+  return i18nString(GoToSymbolInEditor);
+};
+const searchForText = () => {
+  return i18nString(SearchForText);
+};
+const openView = () => {
+  return i18nString(OpenView);
+};
 
 const Div = 4;
 const Input = 6;
@@ -2110,39 +2229,14 @@ const getQuickPickHeaderVirtualDom = () => {
   }, getQuickPickInputVirtualDom()];
 };
 
-const emptyHighlightSections = [];
-
-const getHighlightSections = (highlights, label) => {
-  if (highlights.length === 0) {
-    return emptyHighlightSections;
-  }
-  const sections = [];
-  let position = 0;
-  for (let i = 0; i < highlights.length; i += 2) {
-    const highlightStart = highlights[i];
-    const highlightEnd = highlights[i + 1];
-    if (position < highlightStart) {
-      const beforeText = label.slice(position, highlightStart);
-      sections.push({
-        highlighted: false,
-        text: beforeText
-      });
-    }
-    const highlightText = label.slice(highlightStart, highlightEnd);
-    sections.push({
-      highlighted: true,
-      text: highlightText
-    });
-    position = highlightEnd;
-  }
-  if (position < label.length) {
-    const afterText = label.slice(position);
-    sections.push({
-      highlighted: false,
-      text: afterText
-    });
-  }
-  return sections;
+const getFileIconVirtualDom = icon => {
+  return {
+    type: Img,
+    className: FileIcon,
+    src: icon,
+    role: None,
+    childCount: 0
+  };
 };
 
 const mergeClassNames = (...classNames) => {
@@ -2162,14 +2256,13 @@ const quickPickHighlight = {
   className: QuickPickHighlight,
   childCount: 1
 };
-const getHighlights = (highlights, label) => {
+const getHighlights = (sections, label) => {
   const labelDom = {
     type: Div,
     className: QuickPickItemLabel,
     childCount: 0
   };
   const nodes = [labelDom];
-  const sections = getHighlightSections(highlights, label);
   if (sections.length === 0) {
     labelDom.childCount++;
     nodes.push(text(label));
@@ -2187,21 +2280,6 @@ const getHighlights = (highlights, label) => {
   return nodes;
 };
 
-const addHighlights = (dom, highlights, label) => {
-  const domHighlights = getHighlights(highlights, label);
-  dom.push(...domHighlights);
-};
-
-const getFileIconVirtualDom = icon => {
-  return {
-    type: Img,
-    className: FileIcon,
-    src: icon,
-    role: None,
-    childCount: 0
-  };
-};
-
 const getQuickPickItemVirtualDom = visibleItem => {
   const {
     posInSet,
@@ -2210,10 +2288,9 @@ const getQuickPickItemVirtualDom = visibleItem => {
     isActive,
     description,
     icon,
-    matches,
+    highlights,
     fileIcon
   } = visibleItem;
-  const highlights = matches.slice(1);
   const dom = [];
   dom.push({
     type: Div,
@@ -2240,7 +2317,8 @@ const getQuickPickItemVirtualDom = visibleItem => {
       childCount: 0
     });
   }
-  addHighlights(dom, highlights, label);
+  const highlightDom = getHighlights(highlights, label);
+  dom.push(...highlightDom);
   if (description) {
     parent.childCount++;
     dom.push({
@@ -2256,7 +2334,7 @@ const getQuickPickNoResultsVirtualDom = () => {
   const noResults$1 = noResults();
   return [{
     type: Div,
-    className: 'QuickPickItem QuickPickItemActive QuickPickStatus',
+    className: mergeClassNames(QuickPickItem, QuickPickItemActive$1, QuickPickStatus),
     childCount: 1
   }, {
     type: Div,
@@ -2454,7 +2532,7 @@ const toProtoVisibleItem$2 = name => {
   };
   return pick;
 };
-const getPicks$a = async searchValue => {
+const getPicks$b = async searchValue => {
   const colorThemeNames = await getColorThemeNames();
   const picks = colorThemeNames.map(toProtoVisibleItem$2);
   return picks;
@@ -2526,7 +2604,7 @@ const toProtoVisibleItem$1 = item => {
   pick.id = item.id;
   return pick;
 };
-const getPicks$9 = async () => {
+const getPicks$a = async () => {
   // TODO get picks in parallel
   const builtinPicks = await getBuiltinPicks();
   const extensionPicks = await getExtensionPicks();
@@ -2535,35 +2613,17 @@ const getPicks$9 = async () => {
   return converted;
 };
 
-const getPicks$8 = async searchValue => {
+const getPicks$9 = async searchValue => {
   const items = state$3.args[1] || [];
   return items;
 };
 
-// TODO use numeric enum for quickpick entry id
-const getQuickPickProviderId = prefix => {
-  switch (prefix) {
-    case Command:
-      return Commands;
-    case Symbol:
-      return Symbol$1;
-    case WorkspaceSymbol:
-      return WorkspaceSymbol$1;
-    case GoToLine:
-      return GoToLine$1;
-    case View:
-      return View$1;
-    default:
-      return File$2;
-  }
-};
-
 const state$1 = {
-  provider: Noop,
+  provider: File$2,
   prefix: 'string-that-should-never-match-another-string'
 };
 
-const getPicks$7 = async value => {
+const getPicks$8 = async value => {
   const prefix = getQuickPickPrefix(value);
   const providerId = getQuickPickProviderId(prefix);
 
@@ -2574,7 +2634,7 @@ const getPicks$7 = async value => {
   }
   // TODO this line is a bit duplicated with getFilterValue
   const slicedValue = value.slice(prefix.length).trimStart();
-  const picks = await getPicks$b(providerId, slicedValue);
+  const picks = await getPicks$c(providerId, slicedValue);
   return picks;
 };
 
@@ -2647,7 +2707,7 @@ const convertToPick = uri => {
 // e.g. when there are many files, don't need
 // to compute the fileIcon for all files
 
-const getPicks$6 = async searchValue => {
+const getPicks$7 = async searchValue => {
   // TODO cache workspace path
   const workspace = await getWorkspacePath();
   if (!workspace) {
@@ -2658,7 +2718,7 @@ const getPicks$6 = async searchValue => {
   return picks;
 };
 
-const getPicks$5 = async () => {
+const getPicks$6 = async () => {
   const picks = [{
     label: '1',
     description: '',
@@ -2711,6 +2771,64 @@ const getPicks$5 = async () => {
   return picks;
 };
 
+const DotDotDot = '...';
+const Colon = ':';
+const Percent = '%';
+const AngleBracket = '>';
+const View = 'view';
+
+const getPicks$5 = async () => {
+  return [{
+    description: goToFile(),
+    direntType: None$2,
+    fileIcon: '',
+    icon: '',
+    label: DotDotDot,
+    matches: [],
+    uri: ''
+  }, {
+    description: goToLineColumn(),
+    direntType: None$2,
+    fileIcon: '',
+    icon: '',
+    label: ':',
+    matches: [],
+    uri: ''
+  }, {
+    description: goToSymbolInEditor(),
+    direntType: None$2,
+    fileIcon: '',
+    icon: '',
+    label: Colon,
+    matches: [],
+    uri: ''
+  }, {
+    description: searchForText(),
+    direntType: None$2,
+    fileIcon: '',
+    icon: '',
+    label: Percent,
+    matches: [],
+    uri: ''
+  }, {
+    description: showAndRunCommands(),
+    direntType: None$2,
+    fileIcon: '',
+    icon: '',
+    label: AngleBracket,
+    matches: [],
+    uri: ''
+  }, {
+    description: openView(),
+    direntType: None$2,
+    fileIcon: '',
+    icon: '',
+    label: View,
+    matches: [],
+    uri: ''
+  }];
+};
+
 const getRecentlyOpened = () => {
   return invoke$1(/* RecentlyOpened.getRecentlyOpened */'RecentlyOpened.getRecentlyOpened');
 };
@@ -2738,9 +2856,6 @@ const getPicks$3 = async () => {
 };
 
 const getPicks$2 = async () => {
-  // const views = ViewService.getViews()
-  // const picks = views.map(toPick)
-  // return picks
   return [];
 };
 
@@ -2749,7 +2864,7 @@ const getPicks$1 = async () => {
   return picks;
 };
 
-const selectPick$9 = async pick => {
+const selectPick$a = async pick => {
   const id = pick.label;
   await setColorTheme(/* colorThemeId */id);
   return {
@@ -2788,7 +2903,7 @@ const selectPickExtension = async item => {
     command: Hide
   };
 };
-const selectPick$8 = async item => {
+const selectPick$9 = async item => {
   // @ts-ignore
   const id = item.id;
   if (id.startsWith('ext.')) {
@@ -2797,7 +2912,7 @@ const selectPick$8 = async item => {
   return selectPickBuiltin(item);
 };
 
-const selectPick$7 = async pick => {
+const selectPick$8 = async pick => {
   const {
     args
   } = state$3;
@@ -2808,7 +2923,7 @@ const selectPick$7 = async pick => {
   };
 };
 
-const selectPick$6 = item => {
+const selectPick$7 = item => {
   const {
     provider
   } = state$1;
@@ -2820,7 +2935,7 @@ const openUri = async uri => {
   await invoke$1(/* Main.openUri */'Main.openUri', /* uri */uri);
 };
 
-const selectPick$5 = async pick => {
+const selectPick$6 = async pick => {
   const description = pick.description;
   const fileName = pick.label;
   const workspace = await getWorkspacePath();
@@ -2835,7 +2950,7 @@ const execute = async (method, ...params) => {
   // TODO
 };
 
-const selectPick$4 = async item => {
+const selectPick$5 = async item => {
   const rowIndex = Number.parseInt(item.label);
   const position = {
     rowIndex,
@@ -2848,6 +2963,13 @@ const selectPick$4 = async item => {
   };
 };
 
+const selectPick$4 = async item => {
+  // Command.execute(/* openView */ 549, /* viewName */ item.label)
+  return {
+    command: Hide
+  };
+};
+
 const openWorkspaceFolder = uri => {
   return invoke$1(/* Workspace.setPath */'Workspace.setPath', /* path */uri);
 };
@@ -2880,32 +3002,8 @@ const selectPick = async item => {
   };
 };
 
-const selectPicks = {
-  [ColorTheme]: selectPick$9,
-  [CommandPalette]: selectPick$6,
-  [Commands]: selectPick$8,
-  [Custom]: selectPick$7,
-  [EveryThing]: selectPick$6,
-  [File$2]: selectPick$5,
-  [GoToLine$1]: selectPick$4,
-  [Recent]: selectPick$3,
-  [Symbol$1]: selectPick$2,
-  [View$1]: selectPick$1,
-  [WorkspaceSymbol$1]: selectPick
-};
-const getPicks = {
-  [ColorTheme]: getPicks$a,
-  [CommandPalette]: getPicks$7,
-  [Commands]: getPicks$9,
-  [Custom]: getPicks$8,
-  [EveryThing]: getPicks$7,
-  [GoToLine$1]: getPicks$5,
-  [File$2]: getPicks$6,
-  [Recent]: getPicks$4,
-  [Symbol$1]: getPicks$3,
-  [View$1]: getPicks$2,
-  [WorkspaceSymbol$1]: getPicks$1
-};
+const selectPicks = [selectPick$a, selectPick$7, selectPick$9, selectPick$8, selectPick$7, selectPick$6, selectPick$5, selectPick$4, selectPick$3, selectPick$2, selectPick$1, selectPick];
+const getPicks = [getPicks$b, getPicks$8, getPicks$a, getPicks$9, getPicks$8, getPicks$7, getPicks$6, getPicks$5, getPicks$4, getPicks$3, getPicks$2, getPicks$1];
 
 const Memfs = 'memfs';
 const Html = 'html';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/file-search-worker",
-  "version": "5.8.0",
+  "version": "5.9.0",
   "description": "",
   "keywords": [
     "text-search"