@lvce-editor/text-search-view 1.17.3 → 1.18.0

package/dist/textSearchViewMain.js

@@ -1026,6 +1026,34 @@ const listen$1 = async (module, options) => {
   return ipc;
 };
 
+const createSharedLazyRpc = factory => {
+  let rpcPromise;
+  const getOrCreate = () => {
+    if (!rpcPromise) {
+      rpcPromise = factory();
+    }
+    return rpcPromise;
+  };
+  return {
+    async dispose() {
+      const rpc = await getOrCreate();
+      await rpc.dispose();
+    },
+    async invoke(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invoke(method, ...params);
+    },
+    async invokeAndTransfer(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    async send(method, ...params) {
+      const rpc = await getOrCreate();
+      rpc.send(method, ...params);
+    }
+  };
+};
+
 const create$7 = async ({
   commandMap,
   isMessagePortOpen = true,
@@ -1061,34 +1089,6 @@ const create$6 = async ({
   });
 };
 
-const createSharedLazyRpc = factory => {
-  let rpcPromise;
-  const getOrCreate = () => {
-    if (!rpcPromise) {
-      rpcPromise = factory();
-    }
-    return rpcPromise;
-  };
-  return {
-    async dispose() {
-      const rpc = await getOrCreate();
-      await rpc.dispose();
-    },
-    async invoke(method, ...params) {
-      const rpc = await getOrCreate();
-      return rpc.invoke(method, ...params);
-    },
-    async invokeAndTransfer(method, ...params) {
-      const rpc = await getOrCreate();
-      return rpc.invokeAndTransfer(method, ...params);
-    },
-    async send(method, ...params) {
-      const rpc = await getOrCreate();
-      rpc.send(method, ...params);
-    }
-  };
-};
-
 const create$5 = async ({
   commandMap,
   isMessagePortOpen,
@@ -1189,7 +1189,7 @@ const None$2 = 'none';
 const ScrollBar$1 = 'scrollbar';
 const Status = 'status';
 const ToolBar = 'toolbar';
-const Tree$1 = 'tree';
+const Tree$2 = 'tree';
 const TreeItem$1 = 'treeitem';
 
 const Actions = 'Actions';
@@ -1206,7 +1206,7 @@ const HighlightInserted = 'HighlightInserted';
 const IconButton = 'IconButton';
 const IconButtonDisabled = 'IconButtonDisabled';
 const InputBox = 'InputBox';
-const Label$1 = 'Label';
+const Label = 'Label';
 const List$1 = 'List';
 const MaskIcon = 'MaskIcon';
 const MaskIconBook = 'MaskIconBook';
@@ -1223,7 +1223,7 @@ const MultilineInputBox = 'MultilineInputBox';
 const ScrollBar = 'ScrollBar';
 const ScrollBarThumb = 'ScrollBarThumb';
 const ScrollBarVertical = 'ScrollBarVertical';
-const Search$3 = 'Search';
+const Search$2 = 'Search';
 const SearchField = 'SearchField';
 const SearchFieldButton = 'SearchFieldButton';
 const SearchFieldButtonChecked = 'SearchFieldButtonChecked';
@@ -1244,7 +1244,7 @@ const SearchToggleButton = 'SearchToggleButton';
 const SearchToggleButtonExpanded = 'SearchToggleButtonExpanded';
 const SourceControlBadge = 'SourceControlBadge';
 const ToggleDetails = 'ToggleDetails';
-const Tree = 'Tree';
+const Tree$1 = 'Tree';
 const TreeItem = 'TreeItem';
 const TreeItemActive = 'TreeItemActive';
 const TreeItems$1 = 'TreeItems';
@@ -1254,175 +1254,18 @@ const ViewletSearchMessageIndented = 'ViewletSearchMessageIndented';
 
 const File$2 = 7;
 
-const Audio = 0;
 const Button$2 = 1;
-const Col = 2;
-const ColGroup = 3;
 const Div = 4;
-const H1 = 5;
 const Input = 6;
-const Kbd = 7;
 const Span = 8;
-const Table = 9;
-const TBody = 10;
-const Td = 11;
 const Text = 12;
-const Th = 13;
-const THead = 14;
-const Tr = 15;
-const I = 16;
 const Img = 17;
-const Root = 0;
 const Ins = 20;
 const Del = 21;
-const H2 = 22;
-const H3 = 23;
 const H4 = 24;
-const H5 = 25;
-const H6 = 26;
-const Article = 27;
-const Aside = 28;
-const Footer = 29;
-const Header = 30;
-const Nav = 40;
-const Section = 41;
-const Search$2 = 42;
-const Dd = 43;
-const Dl = 44;
-const Figcaption = 45;
-const Figure = 46;
-const Hr = 47;
-const Li = 48;
-const Ol = 49;
-const P = 50;
-const Pre = 51;
-const A = 53;
-const Abbr = 54;
-const Br = 55;
-const Cite = 56;
-const Data = 57;
-const Time = 58;
-const Tfoot = 59;
-const Ul = 60;
-const Video = 61;
 const TextArea = 62;
-const Select = 63;
-const Option = 64;
-const Code = 65;
-const Label = 66;
-const Dt = 67;
-const Iframe = 68;
-const Main = 69;
-const Strong = 70;
-const Em = 71;
-const Style = 72;
-const Html = 73;
-const Head = 74;
-const Title = 75;
-const Meta = 76;
-const Canvas = 77;
-const Form = 78;
-const BlockQuote = 79;
-const Quote = 80;
-const Circle = 81;
-const Defs = 82;
-const Ellipse = 83;
-const G = 84;
-const Line = 85;
-const Path = 86;
-const Polygon = 87;
-const Polyline = 88;
-const Rect = 89;
-const Svg = 90;
-const Use = 91;
 const Reference = 100;
 
-const VirtualDomElements = {
-  __proto__: null,
-  A,
-  Abbr,
-  Article,
-  Aside,
-  Audio,
-  BlockQuote,
-  Br,
-  Button: Button$2,
-  Canvas,
-  Circle,
-  Cite,
-  Code,
-  Col,
-  ColGroup,
-  Data,
-  Dd,
-  Defs,
-  Del,
-  Div,
-  Dl,
-  Dt,
-  Ellipse,
-  Em,
-  Figcaption,
-  Figure,
-  Footer,
-  Form,
-  G,
-  H1,
-  H2,
-  H3,
-  H4,
-  H5,
-  H6,
-  Head,
-  Header,
-  Hr,
-  Html,
-  I,
-  Iframe,
-  Img,
-  Input,
-  Ins,
-  Kbd,
-  Label,
-  Li,
-  Line,
-  Main,
-  Meta,
-  Nav,
-  Ol,
-  Option,
-  P,
-  Path,
-  Polygon,
-  Polyline,
-  Pre,
-  Quote,
-  Rect,
-  Reference,
-  Root,
-  Search: Search$2,
-  Section,
-  Select,
-  Span,
-  Strong,
-  Style,
-  Svg,
-  TBody,
-  THead,
-  Table,
-  Td,
-  Text,
-  TextArea,
-  Tfoot,
-  Th,
-  Time,
-  Title,
-  Tr,
-  Ul,
-  Use,
-  Video
-};
-
 const Button$1 = 'event.button';
 const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
@@ -1444,7 +1287,7 @@ const None$1 = 0;
 const LeftClick = 0;
 
 const ClipBoardWorker = 3400;
-const DialogWorker = 7014;
+const DialogWorker$1 = 7014;
 const IconThemeWorker = 7009;
 const RendererProcess = 1670;
 const RendererWorker = 1;
@@ -1456,6 +1299,7 @@ const Match$1 = 2;
 
 const FocusElementByName = 'Viewlet.focusElementByName';
 const SetCss = 'Viewlet.setCss';
+const SetDom2 = 'Viewlet.setDom2';
 const SetFocusContext = 'Viewlet.setFocusContext';
 const SetValueByName = 'Viewlet.setValueByName';
 const SetPatches = 'Viewlet.setPatches';
@@ -1491,7 +1335,17 @@ const readText$1 = async () => {
 const {
   invoke: invoke$6,
   set: set$7
-} = create$3(DialogWorker);
+} = create$3(DialogWorker$1);
+const prompt$1 = async (message, options = {}) => {
+  return invoke$6('ConfirmPrompt.prompt', message, options);
+};
+
+const DialogWorker = {
+  __proto__: null,
+  invoke: invoke$6,
+  prompt: prompt$1,
+  set: set$7
+};
 
 const {
   invoke: invoke$5,
@@ -1509,15 +1363,20 @@ const {
 
 const {
   invoke: invoke$3,
-  invokeAndTransfer,
   set: set$4
+} = create$3(TextMeasurementWorker);
+
+const {
+  invoke: invoke$2,
+  invokeAndTransfer,
+  set: set$3
 } = create$3(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
   number(x);
   number(y);
-  await invoke$3('ContextMenu.show2', uid, menuId, x, y, args);
+  await invoke$2('ContextMenu.show2', uid, menuId, x, y, args);
 };
 const sendMessagePortToClipBoardWorker$1 = async (port, rpcId) => {
   const command = 'ClipBoard.handleMessagePort';
@@ -1536,31 +1395,46 @@ const sendMessagePortToIconThemeWorker = async (port, rpcId) => {
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToIconThemeWorker', port, command, rpcId);
 };
 const handleWorkspaceRefresh = async () => {
-  return invoke$3('Layout.handleWorkspaceRefresh');
+  return invoke$2('Layout.handleWorkspaceRefresh');
 };
 const sendMessagePortToTextMeasurementWorker = async port => {
   const command = 'TextMeasurement.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToTextMeasurementWorker', port, command, 0);
 };
 const getPreference = async key => {
-  return await invoke$3('Preferences.get', key);
+  return await invoke$2('Preferences.get', key);
 };
 const openUri$1 = async (uri, focus, options) => {
-  await invoke$3('Main.openUri', uri, focus, options);
+  await invoke$2('Main.openUri', {
+    ...options,
+    focus,
+    uri
+  });
+};
+const openUri2 = async ({
+  focus,
+  selections,
+  uri
+}) => {
+  await invoke$2('Main.openUri', {
+    focus,
+    selections,
+    uri
+  });
 };
 
 const {
-  invoke: invoke$2,
-  set: set$3
+  invoke: invoke$1,
+  set: set$2
 } = create$3(TextSearchWorker);
 const getIncrementalResults = async (searchId, minLineY, maxLineY) => {
-  return invoke$2('TextSearch.getIncrementalResults', searchId, minLineY, maxLineY);
+  return invoke$1('TextSearch.getIncrementalResults', searchId, minLineY, maxLineY);
 };
 const search$1 = async (...args) => {
-  return invoke$2('TextSearch.search', ...args);
+  return invoke$1('TextSearch.search', ...args);
 };
 const searchIncremental = async (...args) => {
-  return invoke$2('TextSearch.searchIncremental', ...args);
+  return invoke$1('TextSearch.searchIncremental', ...args);
 };
 
 const toCommandId = key => {
@@ -1821,8 +1695,6 @@ const text = data => {
   };
 };
 
-new Set(Object.values(VirtualDomElements));
-
 const SetText = 1;
 const Replace$1 = 2;
 const SetAttribute = 3;
@@ -1833,6 +1705,7 @@ const NavigateParent = 8;
 const RemoveChild = 9;
 const NavigateSibling = 10;
 const SetReferenceNodeUid = 11;
+const MultiNavigation = 18;
 
 const isKey = key => {
   return key !== 'type' && key !== 'childCount';
@@ -1893,6 +1766,55 @@ const getChildrenWithCount = (nodes, startIndex, childCount) => {
   };
 };
 
+const isNavigationPatch = patch => {
+  switch (patch.type) {
+    case NavigateChild:
+    case NavigateParent:
+    case NavigateSibling:
+      return true;
+    default:
+      return false;
+  }
+};
+const getNavigationIndex = patch => {
+  switch (patch.type) {
+    case NavigateChild:
+    case NavigateSibling:
+      return patch.index;
+    default:
+      return 0;
+  }
+};
+const appendNavigationPatch = (patches, type, index) => {
+  const previousPatch = patches.at(-1);
+  if (!previousPatch) {
+    patches.push(type === NavigateParent ? {
+      type
+    } : {
+      index,
+      type
+    });
+    return;
+  }
+  if (previousPatch.type === MultiNavigation) {
+    previousPatch.navigations.push(type, index);
+    return;
+  }
+  if (isNavigationPatch(previousPatch)) {
+    patches[patches.length - 1] = {
+      navigations: [previousPatch.type, getNavigationIndex(previousPatch), type, index],
+      type: MultiNavigation
+    };
+    return;
+  }
+  patches.push(type === NavigateParent ? {
+    type
+  } : {
+    index,
+    type
+  });
+};
+
 const compareNodes = (oldNode, newNode) => {
   // Check if node type changed - return null to signal incompatible nodes
   // (caller should handle this with a Replace operation)
@@ -1901,14 +1823,11 @@ const compareNodes = (oldNode, newNode) => {
   }
   const patches = [];
   // Handle reference nodes - special handling for uid changes
-  if (oldNode.type === Reference) {
-    if (oldNode.uid !== newNode.uid) {
-      patches.push({
-        type: SetReferenceNodeUid,
-        uid: newNode.uid
-      });
-    }
-    return patches;
+  if (oldNode.type === Reference && oldNode.uid !== newNode.uid) {
+    patches.push({
+      type: SetReferenceNodeUid,
+      uid: newNode.uid
+    });
   }
   // Handle text nodes
   if (oldNode.type === Text && newNode.type === Text) {
@@ -1921,8 +1840,8 @@ const compareNodes = (oldNode, newNode) => {
     return patches;
   }
   // Compare attributes
-  const oldKeys = getKeys(oldNode);
-  const newKeys = getKeys(newNode);
+  const oldKeys = getKeys(oldNode).filter(key => oldNode.type !== Reference || key !== 'uid');
+  const newKeys = getKeys(newNode).filter(key => newNode.type !== Reference || key !== 'uid');
   // Check for attribute changes
   for (const key of newKeys) {
     if (oldNode[key] !== newNode[key]) {
@@ -1946,34 +1865,31 @@ const compareNodes = (oldNode, newNode) => {
 };
 
 const treeToArray = node => {
-  const result = [node.node];
-  for (const child of node.children) {
-    result.push(...treeToArray(child));
+  const result = [];
+  const stack = [node];
+  while (stack.length > 0) {
+    const current = stack.pop();
+    result.push(current.node);
+    for (let i = current.children.length - 1; i >= 0; i--) {
+      stack.push(current.children[i]);
+    }
   }
   return result;
 };
 
 const navigateToChild = (patches, currentChildIndex, index) => {
   if (currentChildIndex === -1) {
-    patches.push({
-      type: NavigateChild,
-      index
-    });
+    appendNavigationPatch(patches, NavigateChild, index);
     return index;
   }
   if (currentChildIndex !== index) {
-    patches.push({
-      type: NavigateSibling,
-      index
-    });
+    appendNavigationPatch(patches, NavigateSibling, index);
   }
   return index;
 };
 const navigateToParent = (patches, currentChildIndex) => {
   if (currentChildIndex >= 0) {
-    patches.push({
-      type: NavigateParent
-    });
+    appendNavigationPatch(patches, NavigateParent, 0);
   }
   return -1;
 };
@@ -1989,6 +1905,29 @@ const replaceTree = (newNode, patches) => {
     nodes: treeToArray(newNode)
   });
 };
+const appendPatch = (patches, patch) => {
+  switch (patch.type) {
+    case MultiNavigation:
+      for (let i = 0; i < patch.navigations.length; i += 2) {
+        appendNavigationPatch(patches, patch.navigations[i], patch.navigations[i + 1]);
+      }
+      return;
+    case NavigateChild:
+    case NavigateSibling:
+      appendNavigationPatch(patches, patch.type, patch.index);
+      return;
+    case NavigateParent:
+      appendNavigationPatch(patches, patch.type, 0);
+      return;
+    default:
+      patches.push(patch);
+  }
+};
+const appendPatches = (patches, newPatches) => {
+  for (const patch of newPatches) {
+    appendPatch(patches, patch);
+  }
+};
 const diffExistingChild = (oldNode, newNode, patches, currentChildIndex, index) => {
   const nodePatches = compareNodes(oldNode.node, newNode.node);
   if (nodePatches === null) {
@@ -1997,16 +1936,16 @@ const diffExistingChild = (oldNode, newNode, patches, currentChildIndex, index)
     return nextChildIndex;
   }
   const hasChildrenToCompare = oldNode.children.length > 0 || newNode.children.length > 0;
-  if (nodePatches.length === 0 && !hasChildrenToCompare) {
+  const childPatches = [];
+  if (hasChildrenToCompare) {
+    diffChildren(oldNode.children, newNode.children, childPatches);
+  }
+  if (nodePatches.length === 0 && childPatches.length === 0) {
     return currentChildIndex;
   }
   const nextChildIndex = navigateToChild(patches, currentChildIndex, index);
-  if (nodePatches.length > 0) {
-    patches.push(...nodePatches);
-  }
-  if (hasChildrenToCompare) {
-    diffChildren(oldNode.children, newNode.children, patches);
-  }
+  patches.push(...nodePatches);
+  appendPatches(patches, childPatches);
   return nextChildIndex;
 };
 const diffRootNode = (oldNode, newNode, patches) => {
@@ -2062,7 +2001,7 @@ const diffTrees = (oldTree, newTree, patches, path) => {
 const removeTrailingNavigationPatches = patches => {
   while (patches.length > 0) {
     const patch = patches.at(-1);
-    if (patch.type !== NavigateChild && patch.type !== NavigateParent && patch.type !== NavigateSibling) {
+    if (patch.type !== NavigateChild && patch.type !== NavigateParent && patch.type !== NavigateSibling && patch.type !== MultiNavigation) {
       break;
     }
     patches.pop();
@@ -2112,6 +2051,95 @@ const clearSearchResults$1 = state => {
   };
 };
 
+const clamp$1 = (num, min, max) => {
+  return Math.min(Math.max(num, min), max);
+};
+
+const File = 1;
+const Match = 2;
+const Context = 3;
+
+const getFilteredResults = (results, collapsedPaths) => {
+  if (collapsedPaths.length === 0) {
+    return results;
+  }
+  const filteredResults = [];
+  let collapsedDepth = -1;
+  for (const result of results) {
+    const depth = result.depth ?? (result.type === File ? 0 : 1);
+    if (collapsedDepth !== -1) {
+      if (depth > collapsedDepth) {
+        continue;
+      }
+      collapsedDepth = -1;
+    }
+    filteredResults.push(result);
+    if (result.type === File && collapsedPaths.includes(result.text)) {
+      collapsedDepth = depth;
+    }
+  }
+  return filteredResults;
+};
+
+// TODO optimize this function to return the minimum number
+// of visible items needed, e.g. when not scrolled 5 items with
+// 20px fill 100px but when scrolled 6 items are needed
+const getNumberOfVisibleItems$1 = (listHeight, itemHeight) => {
+  return Math.ceil(listHeight / itemHeight) + 1;
+};
+
+const getTreeListItems = results => {
+  const listItems = [];
+  const directories = new Set();
+  let matchDepth = 0;
+  for (const result of results) {
+    if (result.type !== File) {
+      listItems.push({
+        ...result,
+        depth: matchDepth
+      });
+      continue;
+    }
+    const path = result.text.startsWith('./') ? result.text.slice(2) : result.text;
+    const parts = path.split('/');
+    let directory = '';
+    for (let i = 0; i < parts.length - 1; i++) {
+      directory = directory ? `${directory}/${parts[i]}` : parts[i];
+      if (!directories.has(directory)) {
+        directories.add(directory);
+        listItems.push({
+          depth: i,
+          end: 0,
+          isDirectory: true,
+          lineNumber: 0,
+          start: 0,
+          text: directory,
+          type: File
+        });
+      }
+    }
+    matchDepth = parts.length;
+    listItems.push({
+      ...result,
+      depth: matchDepth - 1,
+      text: path
+    });
+  }
+  return listItems;
+};
+
+const getScrollBarSize$1 = (size, contentSize, minimumSliderSize) => {
+  if (size >= contentSize) {
+    return 0;
+  }
+  return Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize);
+};
+const getScrollBarOffset$1 = (delta, finalDelta, size, scrollBarSize) => {
+  const scrollBarOffset = delta / finalDelta * (size - scrollBarSize);
+  return scrollBarOffset;
+};
+const getScrollBarY$1 = getScrollBarOffset$1;
+
 const getFilePath = text => {
   // TODO make api stricter so that results always have the same shape
   if (text.startsWith('./')) {
@@ -2120,13 +2148,9 @@ const getFilePath = text => {
   return text;
 };
 
-const File = 1;
-const Match = 2;
-const Context = 3;
-
 const getIconsCached = (dirents, fileIconCache) => {
   return dirents.map(dirent => {
-    if (dirent.type !== File) {
+    if (dirent.type !== File || dirent.isDirectory) {
       return '';
     }
     const path = getFilePath(dirent.text);
@@ -2143,7 +2167,7 @@ const getFileName = path => {
 };
 
 const isFile = match => {
-  return match.type === File;
+  return match.type === File && !match.isDirectory;
 };
 
 const getMissingDirents = (searchResults, fileIconCache) => {
@@ -2224,60 +2248,72 @@ const getFileIcons = async (items, fileIconCache) => {
   };
 };
 
-const getFilteredResults = (results, collapsedPaths) => {
-  if (collapsedPaths.length === 0) {
-    return results;
-  }
-  const filteredResults = [];
-  let isExcluded = false;
-  for (const result of results) {
-    if (result.type === File) {
-      filteredResults.push(result);
-      isExcluded = collapsedPaths.includes(result.text) ? true : false;
-    }
-    if ((result.type === Match || result.type === Context) && !isExcluded) {
-      filteredResults.push(result);
-    }
+const updateVisibleFileIcons = async (state, fileIconCache) => {
+  const {
+    fileIconCache: currentFileIconCache,
+    listItems,
+    maxLineY,
+    minLineY
+  } = state;
+  const visibleItems = listItems.slice(minLineY, maxLineY);
+  const {
+    icons,
+    newFileIconCache
+  } = await getFileIcons(visibleItems, currentFileIconCache);
+  return {
+    ...state,
+    fileIconCache: newFileIconCache,
+    icons
+  };
+};
+const updateVisibleFileIconsWhenRangeChanges = async (oldState, newState) => {
+  if (oldState.listItems === newState.listItems && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY) {
+    return newState;
   }
-  return filteredResults;
+  return updateVisibleFileIcons(newState);
 };
 
-// TODO optimize this function to return the minimum number
-// of visible items needed, e.g. when not scrolled 5 items with
-// 20px fill 100px but when scrolled 6 items are needed
-const getNumberOfVisibleItems$1 = (listHeight, itemHeight) => {
-  return Math.ceil(listHeight / itemHeight) + 1;
-};
+const List = 1;
+const Tree = 2;
 
 const applyCollapsedPaths = async (state, collapsedPaths, listFocusedIndex) => {
   const {
-    fileIconCache,
+    deltaY: oldDeltaY,
     headerHeight,
     height,
     itemHeight,
-    items
+    items,
+    minimumSliderSize,
+    viewMode
   } = state;
-  const filteredResults = getFilteredResults(items, collapsedPaths);
-  const {
-    icons,
-    newFileIconCache
-  } = await getFileIcons(filteredResults, fileIconCache);
+  const sourceItems = viewMode === Tree ? getTreeListItems(items) : items;
+  const filteredResults = getFilteredResults(sourceItems, collapsedPaths);
   const total = filteredResults.length;
   const listHeight = height - headerHeight;
+  const contentHeight = total * itemHeight;
+  const finalDeltaY = Math.max(contentHeight - listHeight, 0);
+  const deltaY = clamp$1(oldDeltaY, 0, finalDeltaY);
+  const minLineY = Math.floor(deltaY / itemHeight);
   const numberOfVisible = getNumberOfVisibleItems$1(listHeight, itemHeight);
-  const maxLineY = Math.min(numberOfVisible, total);
-  return {
+  const maxLineY = Math.min(minLineY + numberOfVisible, total);
+  const scrollBarHeight = getScrollBarSize$1(height, contentHeight, minimumSliderSize);
+  const scrollBarY = finalDeltaY === 0 ? 0 : getScrollBarY$1(deltaY, finalDeltaY, listHeight, scrollBarHeight);
+  const updatedState = {
     ...state,
     collapsedPaths,
-    fileIconCache: newFileIconCache,
+    deltaY,
+    finalDeltaY,
     focus: FocusSearchResults,
     focusSource: Script,
-    icons,
     listFocused: true,
     listFocusedIndex,
     listItems: filteredResults,
-    maxLineY
+    maxLineY,
+    minLineY,
+    scrollBarHeight,
+    scrollBarY
   };
+  return updateVisibleFileIcons(updatedState);
 };
 
 const getPaths = items => {
@@ -2292,12 +2328,13 @@ const getPaths = items => {
 const collapseAll$1 = async state => {
   const {
     items,
-    listFocusedIndex
+    listFocusedIndex,
+    listItems
   } = state;
   if (items.length === 0) {
     return state;
   }
-  const paths = getPaths(items);
+  const paths = getPaths(listItems);
   return applyCollapsedPaths(state, paths, listFocusedIndex);
 };
 
@@ -2363,13 +2400,6 @@ const getHeaderHeightForFlags = (headerHeight, oldFlags, newFlags) => {
   return newTopHeight + additionalHeight;
 };
 
-const invoke$1 = (method, ...params) => {
-  return get$1(TextMeasurementWorker).invoke(method, ...params);
-};
-const set$2 = rpc => {
-  set$9(TextMeasurementWorker, rpc);
-};
-
 const SearchMessageFontFamily = 'system-ui';
 const SearchMessageFontSize = 13;
 const SearchMessageLineHeight = 13;
@@ -2381,7 +2411,7 @@ const getSearchMessageHeight = async (message, width, flags) => {
   }
   const horizontalSpace = hasDetailsExpanded(flags) ? SearchMessageExpandedHorizontalSpace : SearchMessageCollapsedHorizontalSpace;
   const availableWidth = Math.max(width - horizontalSpace, 1);
-  const textHeight = await invoke$1('TextMeasurement.measureTextBlockHeight', message, SearchMessageFontFamily, SearchMessageFontSize, SearchMessageLineHeight, availableWidth);
+  const textHeight = await invoke$3('TextMeasurement.measureTextBlockHeight', message, SearchMessageFontFamily, SearchMessageFontSize, SearchMessageLineHeight, availableWidth);
   return Math.max(textHeight + VerticalPadding, Minimum);
 };
 
@@ -2503,11 +2533,10 @@ const {
   set: set$1,
   wrapAsyncCommand,
   wrapCommand,
-  wrapGetter
+  wrapGetter,
+  wrapSerialCommand
 } = create$2();
 
-const List = 1;
-
 const create$1 = ({
   headerHeight = 0,
   itemHeight,
@@ -2824,18 +2853,6 @@ const removeItemFromItems = (items, index, matchCount, fileCount) => {
   };
 };
 
-const getScrollBarSize$1 = (size, contentSize, minimumSliderSize) => {
-  if (size >= contentSize) {
-    return 0;
-  }
-  return Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize);
-};
-const getScrollBarOffset$1 = (delta, finalDelta, size, scrollBarSize) => {
-  const scrollBarOffset = delta / finalDelta * (size - scrollBarSize);
-  return scrollBarOffset;
-};
-const getScrollBarY$1 = getScrollBarOffset$1;
-
 const emptyObject = {};
 const i18nString = (key, placeholders = emptyObject) => {
   if (placeholders === emptyObject) {
@@ -3125,7 +3142,6 @@ const removeIndex = async (state, index) => {
   const {
     deltaY,
     fileCount,
-    fileIconCache,
     height,
     itemHeight,
     items,
@@ -3158,19 +3174,12 @@ const removeIndex = async (state, index) => {
   const listHeight = height - headerHeight;
   const scrollBarHeight = getScrollBarSize$1(height, contentHeight, minimumSliderSize);
   const finalDeltaY = Math.max(contentHeight - listHeight, 0);
-  const visible = newItems.slice(0, maxLineY);
-  const {
-    icons,
-    newFileIconCache
-  } = await getFileIcons(visible, fileIconCache);
-  return {
+  const updatedState = {
     ...state,
     deltaY: newDeltaY,
     fileCount: newFileCount,
-    fileIconCache: newFileIconCache,
     finalDeltaY,
     headerHeight,
-    icons,
     items: newItems,
     listFocusedIndex: newFocusedIndex,
     listItems: newItems,
@@ -3181,6 +3190,7 @@ const removeIndex = async (state, index) => {
     minLineY: newMinLineY,
     scrollBarHeight
   };
+  return updateVisibleFileIcons(updatedState);
 };
 
 const dismissItem = state => {
@@ -3585,7 +3595,7 @@ const getMenuEntriesFile = (state, props) => {
     label: copyAll()
   }, menuEntrySeparator, {
     args: [uri],
-    command: 'Search.revealInExplorer',
+    command: 'RevealInExplorer.reveal',
     flags: None$1,
     id: 'revealInExplorerView',
     label: revealInExplorerView()
@@ -3611,7 +3621,7 @@ const getMenuEntriesMatch = (state, props) => {
     label: copyAll()
   }, menuEntrySeparator, {
     args: [uri],
-    command: 'Search.revealInExplorer',
+    command: 'RevealInExplorer.reveal',
     flags: None$1,
     id: 'revealInExplorerView',
     label: revealInExplorerView()
@@ -3690,7 +3700,7 @@ const openSearchEditor = async state => {
 
 const getSearchExcludes = async (fallback = []) => {
   try {
-    const value = await invoke$3('Preferences.get', 'search.exclude');
+    const value = await invoke$2('Preferences.get', 'search.exclude');
     if (Array.isArray(value)) {
       return value.filter(item => typeof item === 'string');
     }
@@ -3781,7 +3791,7 @@ const getSearchHeaderHeight = (flags, messageHeight, warningHeight) => {
 };
 
 const measureTextHeight = (text, fontFamily, fontSize, lineHeight, width) => {
-  return invoke$3('MeasureTextHeight.measureTextBlockHeight', text, fontFamily, fontSize, `${lineHeight}px`, width);
+  return invoke$2('MeasureTextHeight.measureTextBlockHeight', text, fontFamily, fontSize, `${lineHeight}px`, width);
 };
 
 const SearchWarningFontFamily = 'system-ui';
@@ -3821,7 +3831,7 @@ const textSearch = async (root, query, options, assetDir, platform, searchId, ui
   if (!hasOpenEditors(options.flags)) {
     return search$1(root, query, options, assetDir, platform, searchId, uid);
   }
-  const openEditorUris = await invoke$3('GetActiveEditor.getOpenEditorUris');
+  const openEditorUris = await invoke$2('GetActiveEditor.getOpenEditorUris');
   return search$1(root, query, {
     ...options,
     openEditorUris
@@ -3859,7 +3869,13 @@ const handleUpdateFull = async (state, update) => {
   const scheme = getProtocol(root);
   const isFileSearch = scheme === '' || scheme === 'file';
   const shouldUsePullBasedSearch = usePullBasedSearch && isFileSearch;
-  const searchId = shouldUsePullBasedSearch ? crypto.randomUUID() : '';
+  const searchId = crypto.randomUUID();
+  const current = get(uid);
+  const oldState = current ? current.oldState : state;
+  set$1(uid, oldState, {
+    ...partialNewState,
+    searchId
+  });
   const {
     limitHit,
     results
@@ -3881,6 +3897,10 @@ const handleUpdateFull = async (state, update) => {
     usePullBasedSearch: shouldUsePullBasedSearch,
     useRegularExpression: Boolean(flags & UseRegularExpression$2)
   }, assetDir, platform, searchId, uid);
+  const latestAfterSearch = get(uid);
+  if (latestAfterSearch.newState.searchId !== searchId) {
+    return state;
+  }
   if (!Array.isArray(results)) {
     throw new TypeError('results must be of type array');
   }
@@ -3904,8 +3924,12 @@ const handleUpdateFull = async (state, update) => {
     icons,
     newFileIconCache
   } = await getFileIcons(visible, fileIconCache);
-  return {
-    ...partialNewState,
+  const latest = get(uid);
+  if (latest.newState.searchId !== searchId) {
+    return state;
+  }
+  const updatedState = {
+    ...latest.newState,
     collapsedPaths: [],
     deltaY: 0,
     fileCount,
@@ -3929,6 +3953,8 @@ const handleUpdateFull = async (state, update) => {
     threads,
     value
   };
+  set$1(uid, latest.oldState, updatedState);
+  return state;
 };
 
 const waitForNextFrame = async () => {
@@ -3968,8 +3994,7 @@ const textSearchIncremental = async (root, query, options, assetDir, platform, s
       minLineY: 0
     };
     set$1(uid, latest2.oldState, updatedState2);
-    // @ts-ignore
-    await invoke$3('Search.rerender');
+    await invoke$2('Viewlet.requestRender', uid);
     await waitForNextFrame();
   }
   await resultPromise;
@@ -4092,6 +4117,9 @@ const handleUpdatePullBased = async (state, update) => {
   if (!latest) {
     return state;
   }
+  if (latest.newState.searchId !== searchId) {
+    return state;
+  }
   const limitHitWarning = limitHit ? theResultSetOnlyContainsASubSetOfMatches() : '';
   const {
     fileCount,
@@ -4099,15 +4127,21 @@ const handleUpdatePullBased = async (state, update) => {
   } = getTextSearchResultCounts(latest.newState.items);
   const message = getStatusMessage(resultCount, fileCount);
   const [messageHeight, warningHeight] = await Promise.all([getSearchMessageHeight(message, width, flags), getSearchWarningMessageHeight(limitHitWarning, width)]);
+  const current = get(uid);
+  if (current.newState.searchId !== searchId) {
+    return state;
+  }
   const headerHeight = getSearchHeaderHeight(flags, messageHeight, warningHeight);
-  return {
-    ...latest.newState,
+  const updatedState = {
+    ...current.newState,
     headerHeight,
     limitHit,
     limitHitWarning,
     message,
     messageHeight
   };
+  set$1(uid, current.oldState, updatedState);
+  return state;
 };
 
 const handleUpdateValidationError = (state, update, searchInputErrorMessage) => {
@@ -4163,7 +4197,12 @@ const handleUpdate = async (state, update) => {
       workspacePath
     } = partialNewState;
     if (isEmptyString(value) || isEmptyString(workspacePath)) {
-      return handleUpdateEmpty(state, update);
+      const newState = handleUpdateEmpty(state, update);
+      const current = get(newState.uid);
+      if (current) {
+        set$1(newState.uid, current.oldState, newState);
+      }
+      return newState;
     }
     const searchInputErrorMessage = validateSearchInput(value, flags);
     if (searchInputErrorMessage) {
@@ -4193,7 +4232,36 @@ const refresh = async state => {
 };
 
 const viewAsTree = async state => {
-  return state;
+  const {
+    headerHeight,
+    height,
+    itemHeight,
+    items,
+    minimumSliderSize
+  } = state;
+  if (items.length === 0) {
+    return state;
+  }
+  const listItems = getTreeListItems(items);
+  const total = listItems.length;
+  const contentHeight = total * itemHeight;
+  const listHeight = height - headerHeight;
+  const finalDeltaY = Math.max(contentHeight - listHeight, 0);
+  const numberOfVisible = getNumberOfVisibleItems$1(listHeight, itemHeight);
+  const maxLineY = Math.min(numberOfVisible, total);
+  const scrollBarHeight = getScrollBarSize$1(height, contentHeight, minimumSliderSize);
+  const updatedState = {
+    ...state,
+    collapsedPaths: [],
+    deltaY: 0,
+    finalDeltaY,
+    listItems,
+    maxLineY,
+    minLineY: 0,
+    scrollBarHeight,
+    viewMode: Tree
+  };
+  return updateVisibleFileIcons(updatedState);
 };
 
 const handleActionClick = async (state, name) => {
@@ -4225,7 +4293,7 @@ const noop = state => {
 };
 
 const applyBulkReplacement = async bulkEdits => {
-  await invoke$3('BulkReplacement.applyBulkReplacement', bulkEdits);
+  await invoke$2('BulkReplacement.applyBulkReplacement', bulkEdits);
 };
 
 const getReplacedMessage = (fileCount, replaceCount, replacement) => {
@@ -4292,17 +4360,9 @@ const getReplacingMessage = (fileCount, replaceCount) => {
   return replacingManyOccurrencesInManyFiles(replaceCount, fileCount);
 };
 
-const missingDialogWorkerRelay = 'Command "SendMessagePortToExtensionHostWorker.sendMessagePortToDialogWorker" not found';
-const prompt = async (text, options) => {
-  try {
-    return await invoke$6('ConfirmPrompt.prompt', text, options);
-  } catch (error) {
-    if (!String(error).includes(missingDialogWorkerRelay)) {
-      throw error;
-    }
-    return invoke$3('ConfirmPrompt.prompt', text, options);
-  }
-};
+const {
+  prompt
+} = DialogWorker;
 
 const getReplaceAllConfirmText = (matchCount, fileCount, replacement) => {
   if (matchCount === 1) {
@@ -4375,7 +4435,6 @@ const replaceAllInFocusedFile = async (state, fileIndex) => {
   const {
     deltaY,
     fileCount,
-    fileIconCache,
     height,
     itemHeight,
     items,
@@ -4415,19 +4474,12 @@ const replaceAllInFocusedFile = async (state, fileIndex) => {
   const listHeight = height - headerHeight;
   const scrollBarHeight = getScrollBarSize$1(height, contentHeight, minimumSliderSize);
   const finalDeltaY = Math.max(contentHeight - listHeight, 0);
-  const visible = newItems.slice(0, newMaxLineY);
-  const {
-    icons,
-    newFileIconCache
-  } = await getFileIcons(visible, fileIconCache);
-  return {
+  const updatedState = {
     ...state,
     deltaY: newDeltaY,
     fileCount: newFileCount,
-    fileIconCache: newFileIconCache,
     finalDeltaY,
     headerHeight,
-    icons,
     items: newItems,
     listFocusedIndex: newFocusedIndex,
     listItems: newItems,
@@ -4436,8 +4488,10 @@ const replaceAllInFocusedFile = async (state, fileIndex) => {
     message,
     messageHeight,
     minLineY: newMinLineY,
-    scrollBarHeight
+    scrollBarHeight,
+    searchId: ''
   };
+  return updateVisibleFileIcons(updatedState);
 };
 const confirmReplaceAll = async (state, fileIndex) => {
   const {
@@ -4465,9 +4519,11 @@ const replaceAllConfirmed = async (state, fileIndex) => {
     workspacePath
   } = state;
   const bulkEdits = getReplaceElements(items, workspacePath, replacement);
-  // TODO this function should return an error message if an error occurred during bulk edit
-  await applyBulkReplacement(bulkEdits);
-  await handleWorkspaceRefresh();
+  if (bulkEdits.length > 0) {
+    // TODO this function should return an error message if an error occurred during bulk edit
+    await applyBulkReplacement(bulkEdits);
+    await handleWorkspaceRefresh();
+  }
   const fileCount = bulkEdits.length;
   const message = getReplacedMessage(fileCount, matchCount, replacement);
   const {
@@ -4482,7 +4538,8 @@ const replaceAllConfirmed = async (state, fileIndex) => {
     maxLineY: 0,
     message,
     messageHeight,
-    minLineY: 0
+    minLineY: 0,
+    searchId: ''
   };
 };
 const replaceAll = async state => {
@@ -4498,7 +4555,9 @@ const replaceAllWithProgress = async context => {
   const state = context.getState();
   const {
     fileCount: totalFileCount,
-    matchCount: totalMatchCount
+    matchCount: totalMatchCount,
+    searchId: activeSearchId,
+    uid
   } = state;
   const actualIndex = getActualIndex(state);
   const fileIndex = getFileIndex(state, actualIndex);
@@ -4508,16 +4567,49 @@ const replaceAllWithProgress = async context => {
   if (!shouldReplace) {
     return;
   }
-  const message = getReplacingMessage(fileCount, matchCount);
-  const messageLayout = await getSearchMessageLayout(state, message);
+  if (context.getState().searchId !== activeSearchId) {
+    return;
+  }
+  const replacementSearchId = crypto.randomUUID();
+  let progressUpdate = {};
+  if (matchCount > 0) {
+    const message = getReplacingMessage(fileCount, matchCount);
+    const messageLayout = await getSearchMessageLayout(state, message);
+    progressUpdate = {
+      ...messageLayout,
+      message
+    };
+  }
   await context.updateState(latestState => ({
     ...latestState,
-    ...messageLayout,
-    message
+    ...progressUpdate,
+    searchId: replacementSearchId
   }));
-  await invoke$3('Search.rerender');
-  const updatedState = await replaceAllConfirmed(context.getState(), fileIndex);
-  await context.updateState(() => updatedState);
+  if (matchCount > 0) {
+    await invoke$2('Viewlet.requestRender', uid);
+  }
+  const currentBeforeReplacement = get(uid);
+  let replacementState = context.getState();
+  if (currentBeforeReplacement && currentBeforeReplacement.newState.searchId !== replacementSearchId) {
+    if (currentBeforeReplacement.newState.searchId !== activeSearchId) {
+      return;
+    }
+    replacementState = {
+      ...currentBeforeReplacement.newState,
+      ...progressUpdate,
+      searchId: replacementSearchId
+    };
+  }
+  const generationState = {
+    ...replacementState
+  };
+  set$1(uid, generationState, generationState);
+  const updatedState = await replaceAllConfirmed(generationState, fileIndex);
+  const completedGenerationState = {
+    ...updatedState
+  };
+  set$1(uid, completedGenerationState, completedGenerationState);
+  set$1(uid, generationState, updatedState);
 };
 
 const toggleContextLines = async state => {
@@ -4669,21 +4761,11 @@ const handleHeaderFocusOut = state => {
 };
 
 const handleIconThemeChange = async state => {
-  const {
-    items,
-    maxLineY,
-    minLineY
-  } = state;
-  const visibleItems = items.slice(minLineY, maxLineY);
-  const {
-    icons,
-    newFileIconCache
-  } = await getFileIcons(visibleItems, {});
-  return {
+  const stateWithEmptyIconCache = {
     ...state,
-    fileIconCache: newFileIconCache,
-    icons
+    fileIconCache: {}
   };
+  return updateVisibleFileIcons(stateWithEmptyIconCache);
 };
 
 const handleIncludeInput = (state, includeValue, inputSource = Script) => {
@@ -4808,6 +4890,7 @@ const getNewSelections = (selections, name, newValue) => {
     }
   };
 };
+
 const updateValue = (state, name, newValue) => {
   const {
     selections
@@ -5038,7 +5121,7 @@ const handleMessagePort = async (port, viewletCommandMap, setAsRendererProcess =
       throw new TypeError(`Viewlet command not found: ${command}`);
     }
     await fn(uid, ...args);
-    await invoke$3('Viewlet.requestRender', uid);
+    await invoke$2('Viewlet.requestRender', uid);
   };
   const rpc = await create$7({
     commandMap: {
@@ -5052,7 +5135,7 @@ const handleMessagePort = async (port, viewletCommandMap, setAsRendererProcess =
 };
 
 const openFolder = async () => {
-  await invoke$3('Dialog.openFolder');
+  await invoke$2('Dialog.openFolder');
 };
 
 const handleOpenFolderClick = async state => {
@@ -5062,17 +5145,19 @@ const handleOpenFolderClick = async state => {
 
 const handlePullResultsFound = async (state, resultSearchId, newResults) => {
   const {
-    fileIconCache,
-    height,
-    itemHeight,
-    listItems,
-    minimumSliderSize,
-    searchId,
     uid
   } = state;
-  if (searchId !== resultSearchId) {
+  const current = get(uid);
+  if (!current || current.newState.searchId !== resultSearchId) {
     return state;
   }
+  const {
+    fileIconCache,
+    height,
+    itemHeight,
+    listItems,
+    minimumSliderSize
+  } = current.newState;
   const allResults = [...listItems, ...newResults];
   const {
     fileCount,
@@ -5082,7 +5167,7 @@ const handlePullResultsFound = async (state, resultSearchId, newResults) => {
   const {
     headerHeight,
     messageHeight
-  } = await getSearchMessageLayout(state, message);
+  } = await getSearchMessageLayout(current.newState, message);
   const total = allResults.length;
   const contentHeight = total * itemHeight;
   const listHeight = height - headerHeight;
@@ -5096,6 +5181,9 @@ const handlePullResultsFound = async (state, resultSearchId, newResults) => {
     newFileIconCache
   } = await getFileIcons(visible, fileIconCache);
   const latest = get(uid);
+  if (!latest || latest.newState.searchId !== resultSearchId) {
+    return state;
+  }
   const updatedState = {
     ...latest.newState,
     fileCount,
@@ -5113,16 +5201,11 @@ const handlePullResultsFound = async (state, resultSearchId, newResults) => {
     minLineY: 0,
     scrollBarHeight
   };
-  const oldState = latest ? latest.oldState : state;
-  set$1(uid, oldState, updatedState);
-  await invoke$3('Search.rerender');
+  set$1(uid, latest.oldState, updatedState);
+  await invoke$2('Viewlet.requestRender', uid);
   return state;
 };
 
-const clamp$1 = (num, min, max) => {
-  return Math.min(Math.max(num, min), max);
-};
-
 const handleResize = async (state, x, y, width, height) => {
   const {
     deltaY,
@@ -5278,7 +5361,7 @@ const focusIndexScrollUp = (state, index, listHeight, itemHeight, itemsLength) =
     scrollBarY
   };
 };
-const focusIndex = (state, index) => {
+const focusIndex$1 = (state, index) => {
   const {
     headerHeight,
     height,
@@ -5326,24 +5409,24 @@ const next = (items, index) => {
 const previous = (items, index) => {
   return (index === 0 ? items.length : index) - 1;
 };
-const focusFirst = state => {
+const focusFirst$1 = state => {
   const firstIndex = first();
-  return focusIndex(state, firstIndex);
+  return focusIndex$1(state, firstIndex);
 };
-const focusLast = state => {
+const focusLast$1 = state => {
   const {
     items
   } = state;
   const lastIndex = last(items);
-  return focusIndex(state, lastIndex);
+  return focusIndex$1(state, lastIndex);
 };
-const focusNext = state => {
+const focusNext$1 = state => {
   const {
     focusedIndex,
     items
   } = state;
   const nextIndex = next(items, focusedIndex);
-  return focusIndex(state, nextIndex);
+  return focusIndex$1(state, nextIndex);
 };
 
 // based on https://github.com/microsoft/vscode/blob/c0769274fa136b45799edeccc0d0a2f645b75caf/src/vs/base/common/arrays.ts#L625 (License MIT)
@@ -5354,7 +5437,7 @@ const isLastIndex = (array, index) => {
 const lastIndex = array => {
   return array.length - 1;
 };
-const focusNextPage = state => {
+const focusNextPage$1 = state => {
   const {
     focusedIndex,
     items,
@@ -5365,9 +5448,9 @@ const focusNextPage = state => {
     return state;
   }
   const indexNextPage = Math.min(maxLineY + (maxLineY - minLineY) - 2, lastIndex(items));
-  return focusIndex(state, indexNextPage);
+  return focusIndex$1(state, indexNextPage);
 };
-const focusPrevious = state => {
+const focusPrevious$1 = state => {
   const {
     focusedIndex,
     items
@@ -5376,9 +5459,9 @@ const focusPrevious = state => {
     return state;
   }
   const previousIndex = previous(items, focusedIndex);
-  return focusIndex(state, previousIndex);
+  return focusIndex$1(state, previousIndex);
 };
-const focusPreviousPage = state => {
+const focusPreviousPage$1 = state => {
   const {
     focusedIndex,
     maxLineY,
@@ -5388,7 +5471,7 @@ const focusPreviousPage = state => {
     return state;
   }
   const indexPreviousPage = Math.max(minLineY - (maxLineY - minLineY) + 1, 0);
-  return focusIndex(state, indexPreviousPage);
+  return focusIndex$1(state, indexPreviousPage);
 };
 const handleScrollBarCaptureLost = state => {
   return {
@@ -5439,7 +5522,7 @@ const setDeltaY = (state, value) => {
     scrollBarY
   };
 };
-const handleScrollBarClick = (state, eventY) => {
+const handleScrollBarClick$1 = (state, eventY) => {
   const {
     deltaY,
     finalDeltaY,
@@ -5478,7 +5561,7 @@ const getNewPercent = (contentHeight, scrollBarHeight, relativeY) => {
   // clicked at bottom
   return 1;
 };
-const handleScrollBarMove = (state, eventY) => {
+const handleScrollBarMove$1 = (state, eventY) => {
   const {
     finalDeltaY,
     handleOffset,
@@ -5499,6 +5582,54 @@ const handleWheel$1 = (state, deltaMode, deltaY) => {
   return setDeltaY(state, state.deltaY + deltaY);
 };
 
+const applyListOperation = async (state, operation) => {
+  const {
+    items,
+    listItems
+  } = state;
+  const listState = {
+    ...state,
+    items: listItems
+  };
+  const updatedListState = operation(listState);
+  if (updatedListState === listState) {
+    return state;
+  }
+  const updatedState = {
+    ...updatedListState,
+    items
+  };
+  return updateVisibleFileIconsWhenRangeChanges(state, updatedState);
+};
+
+const focusFirst = async state => {
+  return applyListOperation(state, focusFirst$1);
+};
+
+const focusIndex = async (state, index) => {
+  return applyListOperation(state, listState => focusIndex$1(listState, index));
+};
+
+const focusLast = async state => {
+  return applyListOperation(state, focusLast$1);
+};
+
+const focusNext = async state => {
+  return applyListOperation(state, focusNext$1);
+};
+
+const focusNextPage = async state => {
+  return applyListOperation(state, focusNextPage$1);
+};
+
+const focusPrevious = async state => {
+  return applyListOperation(state, focusPrevious$1);
+};
+
+const focusPreviousPage = async state => {
+  return applyListOperation(state, focusPreviousPage$1);
+};
+
 const getListIndex = (eventX, eventY, x, y, deltaY, itemHeight, topHeight, itemCount) => {
   const relativeY = eventY - y - topHeight + deltaY;
   const index = Math.floor(relativeY / itemHeight);
@@ -5545,8 +5676,10 @@ const selectIndexPreview = async (state, searchResult, index) => {
   const fileResult = listItems[fileIndex];
   const relativePath = getRelativePath(fileResult.text);
   const absolutePath = `${workspacePath}${relativePath}`;
-  await openUri(absolutePath, true, {
-    selections: new Uint32Array([rowIndex, startColumnIndex, rowIndex, endColumnIndex])
+  await openUri2({
+    focus: true,
+    selections: new Uint32Array([rowIndex, startColumnIndex, rowIndex, endColumnIndex]),
+    uri: absolutePath
   });
   return {
     ...state,
@@ -5616,31 +5749,16 @@ const handleListPointerDown = async (state, button, name) => {
   };
 };
 
+const handleScrollBarClick = async (state, eventY) => {
+  return applyListOperation(state, listState => handleScrollBarClick$1(listState, eventY));
+};
+
+const handleScrollBarMove = async (state, eventY) => {
+  return applyListOperation(state, listState => handleScrollBarMove$1(listState, eventY));
+};
+
 const handleWheel = async (state, deltaMode, deltaY) => {
-  const {
-    maxLineY: oldMaxLineY,
-    minLineY: oldMinLineY
-  } = state;
-  const newState = handleWheel$1(state, deltaMode, deltaY);
-  if (newState.minLineY === oldMinLineY && newState.maxLineY === oldMaxLineY) {
-    return newState;
-  }
-  const {
-    fileIconCache,
-    listItems,
-    maxLineY,
-    minLineY
-  } = newState;
-  const visibleItems = listItems.slice(minLineY, maxLineY);
-  const {
-    icons,
-    newFileIconCache
-  } = await getFileIcons(visibleItems, fileIconCache);
-  return {
-    ...newState,
-    fileIconCache: newFileIconCache,
-    icons
-  };
+  return applyListOperation(state, listState => handleWheel$1(listState, deltaMode, deltaY));
 };
 
 const getUsePullBasedSearch = async () => {
@@ -5876,24 +5994,32 @@ const getTreeItemIndent = depth => {
   return baseIndent + depth * defaultIndent;
 };
 
-const getSearchDisplayResultFile = (results, fileIcons, i, setSize, collapsedPaths, text, posInSet, relativeIndex, focused, renderFolderPaths, originalResults) => {
+const normalizeRelativePath = path => {
+  if (path.startsWith('./')) {
+    return path.slice(2);
+  }
+  return path;
+};
+
+const getSearchDisplayResultFile = (results, fileIcons, i, setSize, collapsedPaths, text, posInSet, relativeIndex, focused, renderFolderPaths, originalResults, resultDepth, isDirectory) => {
   const path = text;
   const absolutePath = getRelativePath(path);
   const baseName = pathBaseName(path);
   const relativeFolderPath = getRelativeFolderPath(path);
-  const displayText = renderFolderPaths && relativeFolderPath ? `${baseName} — ${relativeFolderPath}` : baseName;
-  const index = originalResults.indexOf(results[i]);
-  const matchCount = getMatchCount(originalResults, index);
+  const displayText = renderFolderPaths && relativeFolderPath && !isDirectory ? `${baseName} — ${relativeFolderPath}` : baseName;
+  const normalizedPath = normalizeRelativePath(path);
+  const index = originalResults.findIndex(result => result.type === results[i].type && normalizeRelativePath(result.text) === normalizedPath);
+  const matchCount = isDirectory ? 0 : getMatchCount(originalResults, index);
   const expanded = collapsedPaths.includes(path) ? Collapsed : Expanded;
-  const badgeText = String(matchCount);
-  const depth = 0;
+  const badgeText = isDirectory ? '' : String(matchCount);
+  const depth = resultDepth ?? 0;
   const indent = getTreeItemIndent(depth);
   return {
     badgeText,
     depth,
     expanded,
     focused,
-    icon: fileIcons[relativeIndex],
+    icon: isDirectory ? '' : fileIcons[relativeIndex],
     indent,
     matchLength: 0,
     matchStart: 0,
@@ -5905,8 +6031,8 @@ const getSearchDisplayResultFile = (results, fileIcons, i, setSize, collapsedPat
   };
 };
 
-const getDisplayResultMatch = (setSize, searchTermLength, replacement, text, posInSet, start, focused) => {
-  const depth = 1;
+const getDisplayResultMatch = (setSize, searchTermLength, replacement, text, posInSet, start, focused, resultDepth = 1) => {
+  const depth = resultDepth;
   const indent = getTreeItemIndent(depth);
   return {
     badgeText: '',
@@ -5928,6 +6054,8 @@ const getDisplayResultMatch = (setSize, searchTermLength, replacement, text, pos
 const getDisplayResult = (results, fileIcons, i, setSize, searchTermLength, replacement, focusedIndex, collapsedPaths, renderFolderPaths, minLineY, originalResults) => {
   const result = results[i];
   const {
+    depth,
+    isDirectory,
     start,
     text,
     type
@@ -5937,11 +6065,11 @@ const getDisplayResult = (results, fileIcons, i, setSize, searchTermLength, repl
   const relativeIndex = i - minLineY;
   switch (type) {
     case Context:
-      return getDisplayResultMatch(setSize, 0, '', text, posInSet, 0, focused);
+      return getDisplayResultMatch(setSize, 0, '', text, posInSet, 0, focused, depth);
     case File:
-      return getSearchDisplayResultFile(results, fileIcons, i, setSize, collapsedPaths, text, posInSet, relativeIndex, focused, renderFolderPaths, originalResults);
+      return getSearchDisplayResultFile(results, fileIcons, i, setSize, collapsedPaths, text, posInSet, relativeIndex, focused, renderFolderPaths, originalResults, depth, isDirectory);
     case Match:
-      return getDisplayResultMatch(setSize, searchTermLength, replacement, text, posInSet, start, focused);
+      return getDisplayResultMatch(setSize, searchTermLength, replacement, text, posInSet, start, focused, depth);
     default:
       throw new Error('unexpected search result type');
   }
@@ -6711,7 +6839,7 @@ const highlighted = {
 };
 const label1 = {
   childCount: 1,
-  className: mergeClassNames(Label$1, Grow),
+  className: mergeClassNames(Label, Grow),
   type: Div
 };
 const label3 = {
@@ -6829,10 +6957,10 @@ const getSearchResultsVirtualDom = (visibleItems, focusOutline, scrollbarHeight,
   const childCount = scrollbarHeight === 0 ? 1 : 2;
   return [{
     childCount,
-    className: mergeClassNames(Viewlet, List$1, Tree, focusOutline ? FocusOutline : Empty$1),
+    className: mergeClassNames(Viewlet, List$1, Tree$1, focusOutline ? FocusOutline : Empty$1),
     onBlur: HandleListBlur,
     onFocus: HandleListFocus,
-    role: Tree$1,
+    role: Tree$2,
     tabIndex: Focusable,
     type: Div
     // TODO renable this when dom diffing is supported
@@ -6840,7 +6968,7 @@ const getSearchResultsVirtualDom = (visibleItems, focusOutline, scrollbarHeight,
   }, ...getTreeItemsVirtualDom(visibleItems, deltaY, itemHeight), ...getScrollBarVirtualDom(scrollbarHeight, scrollBarY, scrollBarValue)];
 };
 
-const className = mergeClassNames(Viewlet, Search$3);
+const className = mergeClassNames(Viewlet, Search$2);
 const getSearchVirtualDom = (visibleItems, flags, message, focusOutline, searchInputErrorMessage, scrollBarHeight, scrollBarY, scrollBarValue, deltaY, itemHeight, matchCount, limitHitWarning, focus = 0, initial = false, isSearchEditor = false, contextLines = 1, contextLinesEnabled = false, workspacePath) => {
   if (initial) {
     return [];
@@ -6863,8 +6991,11 @@ const getDom = newState => {
 
 // TODO cache rendered dom so that it can be used for dom diffing
 const renderIncremental = (oldState, newState) => {
-  const oldDom = getDom(oldState);
   const newDom = getDom(newState);
+  if (oldState.replacement !== newState.replacement) {
+    return [SetDom2, newState.uid, newDom];
+  }
+  const oldDom = getDom(oldState);
   const patches = diffTree(oldDom, newDom);
   return [SetPatches, newState.uid, patches];
 };
@@ -6926,6 +7057,9 @@ const applyRender = (oldState, newState, diffResult) => {
 const renderDirect = async (uid, commands) => {
   const rendererWorkerCommands = commands.filter(command => command[0] === SetFocusContext);
   const rendererProcessCommands = commands.filter(command => command[0] !== SetFocusContext);
+  if (rendererProcessCommands.length === 0) {
+    return rendererWorkerCommands;
+  }
   const transactionId = await invoke('Viewlet.queueCommands', uid, rendererProcessCommands);
   return [...rendererWorkerCommands, ['Viewlet.commitPending', uid, transactionId]];
 };
@@ -7036,7 +7170,7 @@ const getActions = state => {
     type: Button
   }, {
     command: '',
-    enabled: hasSearchResults,
+    enabled: true,
     icon: ListFlat,
     id: ViewAsTree,
     label: viewAsTree$1(),
@@ -7145,19 +7279,6 @@ const rerender = state => {
   };
 };
 
-const revealInExplorerActual = async uri => {
-  await invoke$3('SideBar.show', 'Explorer');
-  const states = await invoke$3('Viewlet.getAllStates');
-  const viewlets = Object.values(states);
-  const sideBar = viewlets.find(viewlet => viewlet.currentViewletId === 'Explorer');
-  const explorerUid = Math.max(...viewlets.filter(viewlet => viewlet.parentUid === sideBar.uid).map(viewlet => viewlet.uid));
-  await invoke$3('Viewlet.executeViewletCommand', explorerUid, 'reveal', uri);
-};
-const revealInExplorer = async (state, uri) => {
-  await revealInExplorerActual(uri);
-  return state;
-};
-
 const saveState = state => {
   const {
     collapsedPaths,
@@ -7261,6 +7382,7 @@ const getNewHistory = (history, newValue) => {
   const cutHistory = newHistory.slice(0, maxHistoryLength);
   return cutHistory;
 };
+
 const submit = state => {
   const {
     history,
@@ -7380,16 +7502,16 @@ const commandMap$1 = {
   'TextSearch.handleActionClick': wrapCommand(handleActionClick),
   'TextSearch.handleClickAt': wrapCommand(handleClickAt),
   'TextSearch.handleContextMenu': wrapCommand(handleContextMenu),
-  'TextSearch.handleExcludeInput': wrapCommand(handleExcludeInput),
+  'TextSearch.handleExcludeInput': wrapSerialCommand(handleExcludeInput),
   'TextSearch.handleFocusIn': wrapCommand(handleFocusIn),
   'TextSearch.handleHeaderClick': wrapCommand(handleHeaderClick),
   'TextSearch.handleHeaderContextMenu': wrapCommand(handleHeaderContextMenu),
   'TextSearch.handleHeaderFocusIn': wrapCommand(handleHeaderFocusIn),
   'TextSearch.handleHeaderFocusOut': wrapCommand(handleHeaderFocusOut),
   'TextSearch.handleIconThemeChange': wrapCommand(handleIconThemeChange),
-  'TextSearch.handleIncludeInput': wrapCommand(handleIncludeInput),
-  'TextSearch.handleInput': wrapCommand(handleInput),
-  'TextSearch.handleInput2': wrapCommand(handleInput2),
+  'TextSearch.handleIncludeInput': wrapSerialCommand(handleIncludeInput),
+  'TextSearch.handleInput': wrapSerialCommand(handleInput),
+  'TextSearch.handleInput2': wrapSerialCommand(handleInput2),
   'TextSearch.handleInputBlur': wrapCommand(handleInputBlur),
   'TextSearch.handleInputContextMenu': wrapCommand(handleInputContextMenu),
   'TextSearch.handleInputCopy': wrapCommand(handleInputCopy),
@@ -7404,7 +7526,7 @@ const commandMap$1 = {
   'TextSearch.handleMessagePort': handleDirectMessagePort,
   'TextSearch.handleOpenFolderClick': wrapCommand(handleOpenFolderClick),
   'TextSearch.handlePullResultsFound': wrapCommand(handlePullResultsFound),
-  'TextSearch.handleReplaceInput': wrapCommand(handleReplaceInput),
+  'TextSearch.handleReplaceInput': wrapSerialCommand(handleReplaceInput),
   'TextSearch.handleResize': wrapCommand(handleResize),
   'TextSearch.handleScrollBarCaptureLost': wrapCommand(handleScrollBarCaptureLost),
   'TextSearch.handleScrollBarClick': wrapCommand(handleScrollBarClick),
@@ -7413,9 +7535,9 @@ const commandMap$1 = {
   'TextSearch.handleWheel': wrapCommand(handleWheel),
   'TextSearch.handleWorkspaceChange': wrapCommand(handleWorkspaceChange),
   'TextSearch.loadContent': wrapCommand(loadContent),
-  'TextSearch.nextHistoryResult': wrapCommand(nextHistoryResult),
+  'TextSearch.nextHistoryResult': wrapSerialCommand(nextHistoryResult),
   'TextSearch.openSearchEditor': wrapCommand(openSearchEditor),
-  'TextSearch.previousHistoryResult': wrapCommand(previousHistoryResult),
+  'TextSearch.previousHistoryResult': wrapSerialCommand(previousHistoryResult),
   'TextSearch.refresh': wrapCommand(refresh),
   'TextSearch.removeCurrent': wrapCommand(removeCurrent),
   'TextSearch.removeIndex': wrapCommand(removeIndex),
@@ -7429,21 +7551,20 @@ const commandMap$1 = {
   'TextSearch.replaceAllInFile': wrapCommand(replaceAllInFile),
   'TextSearch.rerender': rerender,
   'TextSearch.restoreState': restoreState,
-  'TextSearch.revealInExplorer': wrapCommand(revealInExplorer),
   'TextSearch.saveState': wrapGetter(saveState),
   'TextSearch.selectIndex': wrapCommand(selectIndex),
-  'TextSearch.setLimit': wrapCommand(setLimit),
-  'TextSearch.submit': wrapCommand(submit),
+  'TextSearch.setLimit': wrapSerialCommand(setLimit),
+  'TextSearch.submit': wrapSerialCommand(submit),
   'TextSearch.terminate': terminate,
   'TextSearch.textSearch': textSearch,
-  'TextSearch.toggleMatchCase': wrapCommand(toggleMatchCase),
-  'TextSearch.toggleMatchWholeWord': wrapCommand(toggleMatchWholeWord),
-  'TextSearch.toggleOpenEditors': wrapCommand(toggleOpenEditors),
+  'TextSearch.toggleMatchCase': wrapSerialCommand(toggleMatchCase),
+  'TextSearch.toggleMatchWholeWord': wrapSerialCommand(toggleMatchWholeWord),
+  'TextSearch.toggleOpenEditors': wrapSerialCommand(toggleOpenEditors),
   'TextSearch.togglePreserveCase': wrapCommand(togglePreserveCase),
-  'TextSearch.toggleReplace': wrapCommand(toggleReplace),
+  'TextSearch.toggleReplace': wrapSerialCommand(toggleReplace),
   'TextSearch.toggleSearchDetails': wrapCommand(toggleDetailsExpanded),
-  'TextSearch.toggleUseIgnoreFiles': wrapCommand(toggleUseIgnoreFiles),
-  'TextSearch.toggleUseRegularExpression': wrapCommand(toggleUseRegularExpression),
+  'TextSearch.toggleUseIgnoreFiles': wrapSerialCommand(toggleUseIgnoreFiles),
+  'TextSearch.toggleUseRegularExpression': wrapSerialCommand(toggleUseRegularExpression),
   'TextSearch.viewAsTree': wrapCommand(viewAsTree)
 };
 
@@ -7491,7 +7612,7 @@ const initializeTextMeasurementWorker = async () => {
     commandMap: {},
     send: send$1
   });
-  set$2(rpc);
+  set$4(rpc);
 };
 
 const commandMap = {
@@ -7510,7 +7631,7 @@ const launchTextSearchWorker = async () => {
 
 const initializeTextSearchWorker = async () => {
   const rpc = await launchTextSearchWorker();
-  set$3(rpc);
+  set$2(rpc);
 };
 
 const listen = async () => {
@@ -7518,7 +7639,7 @@ const listen = async () => {
   const rpc = await create$4({
     commandMap: commandMap$1
   });
-  set$4(rpc);
+  set$3(rpc);
   await Promise.all([initializeClipBoardWorker(), initializeDialogWorker(), initializeIconThemeWorker(), initializeTextMeasurementWorker(), initializeTextSearchWorker()]);
 };