@lvce-editor/static-server 0.111.22 → 0.111.24

package/static/{d813ad8 → ae28605}/packages/text-search-view/dist/textSearchViewMain.js

@@ -1135,7 +1135,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$7 = (id, rpc) => {
+const set$8 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1168,7 +1168,7 @@ const create$3 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$7(rpcId, mockRpc);
+      set$8(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove$2(rpcId);
@@ -1177,7 +1177,7 @@ const create$3 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$7(rpcId, rpc);
+      set$8(rpcId, rpc);
     }
   };
 };
@@ -1447,6 +1447,7 @@ const DialogWorker = 7014;
 const IconThemeWorker = 7009;
 const RendererProcess = 1670;
 const RendererWorker = 1;
+const TextMeasurementWorker = 7011;
 const TextSearchWorker = 7010;
 
 const File$1 = 1;
@@ -1476,35 +1477,35 @@ const FocusToggleDetails = 1010;
 const FocusToggleReplace = 1020;
 
 const {
-  invoke: invoke$5,
-  set: set$6
+  invoke: invoke$6,
+  set: set$7
 } = create$3(DialogWorker);
 
 const {
-  invoke: invoke$4,
-  set: set$5
+  invoke: invoke$5,
+  set: set$6
 } = create$3(IconThemeWorker);
 const getIcons = async iconRequests => {
   // @ts-ignore
-  return invoke$4('IconTheme.getIcons', iconRequests);
+  return invoke$5('IconTheme.getIcons', iconRequests);
 };
 
 const {
-  invoke: invoke$3,
-  set: set$4
+  invoke: invoke$4,
+  set: set$5
 } = create$3(RendererProcess);
 
 const {
-  invoke: invoke$2,
+  invoke: invoke$3,
   invokeAndTransfer,
-  set: set$3
+  set: set$4
 } = create$3(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
   number(x);
   number(y);
-  await invoke$2('ContextMenu.show2', uid, menuId, x, y, args);
+  await invoke$3('ContextMenu.show2', uid, menuId, x, y, args);
 };
 const sendMessagePortToTextSearchWorker = async (port, rpcId) => {
   const command = 'HandleMessagePort.handleMessagePort';
@@ -1519,30 +1520,34 @@ const sendMessagePortToIconThemeWorker = async (port, rpcId) => {
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToIconThemeWorker', port, command, rpcId);
 };
 const handleWorkspaceRefresh = async () => {
-  return invoke$2('Layout.handleWorkspaceRefresh');
+  return invoke$3('Layout.handleWorkspaceRefresh');
 };
 const writeClipBoardText = async text => {
-  await invoke$2('ClipBoard.writeText', /* text */text);
+  await invoke$3('ClipBoard.writeText', /* text */text);
+};
+const sendMessagePortToTextMeasurementWorker = async port => {
+  const command = 'TextMeasurement.handleMessagePort';
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToTextMeasurementWorker', port, command, 0);
 };
 const getPreference = async key => {
-  return await invoke$2('Preferences.get', key);
+  return await invoke$3('Preferences.get', key);
 };
 const openUri$1 = async (uri, focus, options) => {
-  await invoke$2('Main.openUri', uri, focus, options);
+  await invoke$3('Main.openUri', uri, focus, options);
 };
 
 const {
-  invoke: invoke$1,
-  set: set$2
+  invoke: invoke$2,
+  set: set$3
 } = create$3(TextSearchWorker);
 const getIncrementalResults = async (searchId, minLineY, maxLineY) => {
-  return invoke$1('TextSearch.getIncrementalResults', searchId, minLineY, maxLineY);
+  return invoke$2('TextSearch.getIncrementalResults', searchId, minLineY, maxLineY);
 };
 const search$1 = async (...args) => {
-  return invoke$1('TextSearch.search', ...args);
+  return invoke$2('TextSearch.search', ...args);
 };
 const searchIncremental = async (...args) => {
-  return invoke$1('TextSearch.searchIncremental', ...args);
+  return invoke$2('TextSearch.searchIncremental', ...args);
 };
 
 const toCommandId = key => {
@@ -2066,17 +2071,27 @@ const diffTree = (oldNodes, newNodes) => {
 const User = 1;
 const Script = 2;
 
+const Minimum = 30;
+const VerticalPadding = 13;
+
 const clearSearchResults$1 = state => {
+  const {
+    headerHeight: oldHeaderHeight,
+    messageHeight: oldMessageHeight
+  } = state;
+  const headerHeight = oldHeaderHeight + Minimum - oldMessageHeight;
   return {
     ...state,
     focus: FocusSearchInput,
     focusSource: Script,
+    headerHeight,
     inputSource: Script,
     items: [],
     limitHit: false,
     limitHitWarning: '',
     maxLineY: 0,
     message: '',
+    messageHeight: Minimum,
     minLineY: 0,
     replacement: '',
     searchInputErrorMessage: '',
@@ -2331,22 +2346,49 @@ const getTopHeight = flags => {
 const getHeaderHeightForFlags = (headerHeight, oldFlags, newFlags) => {
   const oldTopHeight = getTopHeight(oldFlags);
   const newTopHeight = getTopHeight(newFlags);
-  const warningHeight = Math.max(headerHeight - oldTopHeight, 0);
-  return newTopHeight + warningHeight;
+  const additionalHeight = Math.max(headerHeight - oldTopHeight, 0);
+  return newTopHeight + additionalHeight;
 };
 
-const collapseDetails = state => {
+const invoke$1 = (method, ...params) => {
+  return get$1(TextMeasurementWorker).invoke(method, ...params);
+};
+const set$2 = rpc => {
+  set$8(TextMeasurementWorker, rpc);
+};
+
+const SearchMessageFontFamily = 'system-ui';
+const SearchMessageFontSize = 13;
+const SearchMessageLineHeight = 13;
+const SearchMessageCollapsedHorizontalSpace = 52;
+const SearchMessageExpandedHorizontalSpace = 30;
+const getSearchMessageHeight = async (message, width, flags) => {
+  if (!message) {
+    return Minimum;
+  }
+  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);
+  return Math.max(textHeight + VerticalPadding, Minimum);
+};
+
+const collapseDetails = async state => {
   const {
     flags,
-    headerHeight
+    headerHeight,
+    message,
+    messageHeight: oldMessageHeight,
+    width
   } = state;
   const newFlags = flags & -33;
+  const messageHeight = await getSearchMessageHeight(message, width, newFlags);
   return {
     ...state,
     flags: newFlags,
     focus: FocusSearchInput,
     focusSource: Script,
-    headerHeight: getHeaderHeightForFlags(headerHeight, flags, newFlags)
+    headerHeight: getHeaderHeightForFlags(headerHeight, flags, newFlags) + messageHeight - oldMessageHeight,
+    messageHeight
   };
 };
 
@@ -2367,7 +2409,7 @@ const writeText = async text => {
   await writeClipBoardText(text);
 };
 const readText = async () => {
-  return await invoke$2('ClipBoard.readText');
+  return await invoke$3('ClipBoard.readText');
 };
 
 const getActualIndex$1 = state => {
@@ -2526,6 +2568,7 @@ const create = (uid, x, y, width, height, workspacePath, assetDir, itemHeight, v
     loaded: false,
     matchCount: 0,
     message: '',
+    messageHeight: Minimum,
     platform,
     removeButtonRight: 0,
     removeButtonWidth: 20,
@@ -2563,7 +2606,7 @@ const create = (uid, x, y, width, height, workspacePath, assetDir, itemHeight, v
 };
 
 const isEqual$7 = (oldState, newState) => {
-  return oldState.deltaY === newState.deltaY && oldState.finalDeltaY === newState.finalDeltaY && oldState.height === newState.height && oldState.headerHeight === newState.headerHeight && oldState.itemHeight === newState.itemHeight && oldState.items === newState.items && oldState.loaded === newState.loaded;
+  return oldState.deltaY === newState.deltaY && oldState.finalDeltaY === newState.finalDeltaY && oldState.height === newState.height && oldState.headerHeight === newState.headerHeight && oldState.itemHeight === newState.itemHeight && oldState.items === newState.items && oldState.messageHeight === newState.messageHeight && oldState.loaded === newState.loaded;
 };
 
 const isEqual$6 = (oldState, newState) => {
@@ -2652,6 +2695,20 @@ const getNewMinMax = (newItemsLength, minLineY, maxLineY, deltaY, itemHeight) =>
   };
 };
 
+const getSearchMessageLayout = async (state, message) => {
+  const {
+    flags,
+    headerHeight,
+    messageHeight: oldMessageHeight,
+    width
+  } = state;
+  const messageHeight = await getSearchMessageHeight(message, width, flags);
+  return {
+    headerHeight: headerHeight + messageHeight - oldMessageHeight,
+    messageHeight
+  };
+};
+
 // based on https://github.com/microsoft/vscode/blob/c0769274fa136b45799edeccc0d0a2f645b75caf/src/vs/base/common/arrays.ts#L625 (License MIT)
 
 const remove$1 = (array, index, deleteCount) => {
@@ -2817,8 +2874,12 @@ const RevealInExplorerView = 'Reveal in Explorer View';
 const ReplacingManyOccurrencesInManyFiles = 'Replacing {PH1} occurrences across {PH2} files…';
 const ReplacingManyOccurrencesInOneFile = 'Replacing {PH1} occurrences across 1 file…';
 const ReplacingOneOccurrenceInOneFile = 'Replacing 1 occurrence across 1 file…';
+const ReplacedManyOccurrencesInManyFilesNoValue = 'Replaced {PH1} occurrences across {PH2} files';
 const ReplacedManyOccurrencesInManyFiles = "Replaced {PH1} occurrences across {PH2} files with '{PH3}'";
+const ReplacedManyOccurrencesInOneFile = "Replaced {PH1} occurrences across 1 file with '{PH2}'";
+const ReplacedManyOccurrencesInOneFileNoValue = 'Replaced {PH1} occurrences across 1 file';
 const ReplacedOneOccurrenceInOneFile = "Replaced 1 occurrence across 1 file with '{PH1}'";
+const ReplacedOneOccurrenceInOneFileNoValue = 'Replaced 1 occurrence across 1 file';
 const ReplaceForHistory = 'Replace (⇅ for history)';
 const Search = 'Search';
 const SearchForHistory = 'Search (⇅ for history)';
@@ -2911,12 +2972,20 @@ const replacedOneOccurrenceInOneFile = replacement => {
     PH1: replacement
   });
 };
+const replacedOneOccurrenceInOneFileNoValue = () => {
+  return i18nString(ReplacedOneOccurrenceInOneFileNoValue);
+};
 const replacedManyOccurrencesInOneFile = (matchCount, replacement) => {
-  return i18nString(ReplacedOneOccurrenceInOneFile, {
+  return i18nString(ReplacedManyOccurrencesInOneFile, {
     PH1: matchCount,
     PH2: replacement
   });
 };
+const replacedManyOccurrencesInOneFileNoValue = matchCount => {
+  return i18nString(ReplacedManyOccurrencesInOneFileNoValue, {
+    PH1: matchCount
+  });
+};
 const replacedManyOccurrencesInManyFiles = (matchCount, fileCount, replacement) => {
   return i18nString(ReplacedManyOccurrencesInManyFiles, {
     PH1: matchCount,
@@ -2924,6 +2993,12 @@ const replacedManyOccurrencesInManyFiles = (matchCount, fileCount, replacement)
     PH3: replacement
   });
 };
+const replacedManyOccurrencesInManyFilesNoValue = (matchCount, fileCount) => {
+  return i18nString(ReplacedManyOccurrencesInManyFilesNoValue, {
+    PH1: matchCount,
+    PH2: fileCount
+  });
+};
 const replacingOneOccurrenceInOneFile = () => {
   return i18nString(ReplacingOneOccurrenceInOneFile);
 };
@@ -3038,7 +3113,6 @@ const removeIndex = async (state, index) => {
     deltaY,
     fileCount,
     fileIconCache,
-    headerHeight,
     height,
     itemHeight,
     items,
@@ -3057,6 +3131,10 @@ const removeIndex = async (state, index) => {
     newMatchCount
   } = removeItemFromItems(items, index, matchCount, fileCount);
   const message = getStatusMessage(newMatchCount, newFileCount);
+  const {
+    headerHeight,
+    messageHeight
+  } = await getSearchMessageLayout(state, message);
   const {
     newDeltaY,
     newMaxLineY,
@@ -3078,6 +3156,7 @@ const removeIndex = async (state, index) => {
     fileCount: newFileCount,
     fileIconCache: newFileIconCache,
     finalDeltaY,
+    headerHeight,
     icons,
     items: newItems,
     listFocusedIndex: newFocusedIndex,
@@ -3085,6 +3164,7 @@ const removeIndex = async (state, index) => {
     matchCount: newMatchCount,
     maxLineY: newMaxLineY,
     message,
+    messageHeight,
     minLineY: newMinLineY,
     scrollBarHeight
   };
@@ -3128,18 +3208,23 @@ const expandCurrent = async state => {
   return applyCollapsedPaths(state, collapsedPaths.toSpliced(collapsedIndex, 1), actualIndex);
 };
 
-const expandDetails = state => {
+const expandDetails = async state => {
   const {
     flags,
-    headerHeight
+    headerHeight,
+    message,
+    messageHeight: oldMessageHeight,
+    width
   } = state;
   const newFlags = flags | DetailsExpanded;
+  const messageHeight = await getSearchMessageHeight(message, width, newFlags);
   return {
     ...state,
     flags: newFlags,
     focus: FocusSearchIncludeInput,
     focusSource: Script,
-    headerHeight: getHeaderHeightForFlags(headerHeight, flags, newFlags)
+    headerHeight: getHeaderHeightForFlags(headerHeight, flags, newFlags) + messageHeight - oldMessageHeight,
+    messageHeight
   };
 };
 
@@ -3592,7 +3677,7 @@ const openSearchEditor = async state => {
 
 const getSearchExcludes = async (fallback = []) => {
   try {
-    const value = await invoke$2('Preferences.get', 'search.exclude');
+    const value = await invoke$3('Preferences.get', 'search.exclude');
     if (!value || typeof value !== 'object' || Array.isArray(value)) {
       return [];
     }
@@ -3634,6 +3719,7 @@ const handleUpdateEmpty = (state, update) => {
     matchCount: 0,
     maxLineY: 0,
     message: '',
+    messageHeight: Minimum,
     minLineY: 0,
     scrollBarHeight: 0,
     scrollBarY: 0,
@@ -3647,14 +3733,19 @@ const handleUpdateError = async (state, update, error) => {
     ...state,
     ...update
   };
+  const message = `${error}`;
+  const messageHeight = await getSearchMessageHeight(message, partialNewState.width, partialNewState.flags);
+  const headerHeight = partialNewState.headerHeight + messageHeight - partialNewState.messageHeight;
   return {
     ...partialNewState,
     fileCount: 0,
+    headerHeight,
     items: [],
     listItems: [],
     matchCount: 0,
     maxLineY: 0,
-    message: `${error}`,
+    message,
+    messageHeight,
     minLineY: 0
   };
 };
@@ -3668,8 +3759,13 @@ const getProtocol = uri => {
   return '';
 };
 
+const getSearchHeaderHeight = (flags, messageHeight, warningHeight) => {
+  const additionalMessageHeight = Math.max(messageHeight - Minimum, 0);
+  return getTopHeight(flags) + additionalMessageHeight + warningHeight;
+};
+
 const measureTextHeight = (text, fontFamily, fontSize, lineHeight, width) => {
-  return invoke$2('MeasureTextHeight.measureTextBlockHeight', text, fontFamily, fontSize, `${lineHeight}px`, width);
+  return invoke$3('MeasureTextHeight.measureTextBlockHeight', text, fontFamily, fontSize, `${lineHeight}px`, width);
 };
 
 const SearchWarningFontFamily = 'system-ui';
@@ -3709,7 +3805,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$2('GetActiveEditor.getOpenEditorUris');
+  const openEditorUris = await invoke$3('GetActiveEditor.getOpenEditorUris');
   return search$1(root, query, {
     ...options,
     openEditorUris
@@ -3778,8 +3874,8 @@ const handleUpdateFull = async (state, update) => {
   } = getTextSearchResultCounts(results);
   const message = getStatusMessage(resultCount, fileCount);
   const limitHitWarning = limitHit ? theResultSetOnlyContainsASubSetOfMatches() : '';
-  const warningHeight = await getSearchWarningMessageHeight(limitHitWarning, width);
-  const headerHeight = getTopHeight(flags) + warningHeight;
+  const [messageHeight, warningHeight] = await Promise.all([getSearchMessageHeight(message, width, flags), getSearchWarningMessageHeight(limitHitWarning, width)]);
+  const headerHeight = getSearchHeaderHeight(flags, messageHeight, warningHeight);
   const total = results.length;
   const contentHeight = total * itemHeight;
   const listHeight = height - headerHeight;
@@ -3809,6 +3905,7 @@ const handleUpdateFull = async (state, update) => {
     matchCount: resultCount,
     maxLineY: maxLineY,
     message,
+    messageHeight,
     minLineY: 0,
     scrollBarHeight,
     searchId,
@@ -3856,7 +3953,7 @@ const textSearchIncremental = async (root, query, options, assetDir, platform, s
     };
     set$1(uid, latest2.oldState, updatedState2);
     // @ts-ignore
-    await invoke$2('Search.rerender');
+    await invoke$3('Search.rerender');
     await waitForNextFrame();
   }
   await resultPromise;
@@ -3980,19 +4077,20 @@ const handleUpdatePullBased = async (state, update) => {
     return state;
   }
   const limitHitWarning = limitHit ? theResultSetOnlyContainsASubSetOfMatches() : '';
-  const warningHeight = await getSearchWarningMessageHeight(limitHitWarning, width);
-  const headerHeight = getTopHeight(flags) + warningHeight;
   const {
     fileCount,
     resultCount
   } = getTextSearchResultCounts(latest.newState.items);
   const message = getStatusMessage(resultCount, fileCount);
+  const [messageHeight, warningHeight] = await Promise.all([getSearchMessageHeight(message, width, flags), getSearchWarningMessageHeight(limitHitWarning, width)]);
+  const headerHeight = getSearchHeaderHeight(flags, messageHeight, warningHeight);
   return {
     ...latest.newState,
     headerHeight,
     limitHit,
     limitHitWarning,
-    message
+    message,
+    messageHeight
   };
 };
 
@@ -4111,10 +4209,19 @@ const noop = state => {
 };
 
 const applyBulkReplacement = async bulkEdits => {
-  await invoke$2('BulkReplacement.applyBulkReplacement', bulkEdits);
+  await invoke$3('BulkReplacement.applyBulkReplacement', bulkEdits);
 };
 
 const getReplacedMessage = (fileCount, replaceCount, replacement) => {
+  if (replacement === '') {
+    if (replaceCount === 1) {
+      return replacedOneOccurrenceInOneFileNoValue();
+    }
+    if (fileCount === 1) {
+      return replacedManyOccurrencesInOneFileNoValue(replaceCount);
+    }
+    return replacedManyOccurrencesInManyFilesNoValue(replaceCount, fileCount);
+  }
   if (replaceCount === 1) {
     return replacedOneOccurrenceInOneFile(replacement);
   }
@@ -4172,12 +4279,12 @@ const getReplacingMessage = (fileCount, replaceCount) => {
 const missingDialogWorkerRelay = 'Command "SendMessagePortToExtensionHostWorker.sendMessagePortToDialogWorker" not found';
 const prompt = async (text, options) => {
   try {
-    return await invoke$5('ConfirmPrompt.prompt', text, options);
+    return await invoke$6('ConfirmPrompt.prompt', text, options);
   } catch (error) {
     if (!String(error).includes(missingDialogWorkerRelay)) {
       throw error;
     }
-    return invoke$2('ConfirmPrompt.prompt', text, options);
+    return invoke$3('ConfirmPrompt.prompt', text, options);
   }
 };
 
@@ -4253,7 +4360,6 @@ const replaceAllInFocusedFile = async (state, fileIndex) => {
     deltaY,
     fileCount,
     fileIconCache,
-    headerHeight,
     height,
     itemHeight,
     items,
@@ -4278,6 +4384,11 @@ const replaceAllInFocusedFile = async (state, fileIndex) => {
     newItems,
     newMatchCount
   } = removeItemFromItems(items, fileIndex, totalMatchCount, fileCount);
+  const message = getReplacedMessage(1, matchCount, replacement);
+  const {
+    headerHeight,
+    messageHeight
+  } = await getSearchMessageLayout(state, message);
   const {
     newDeltaY,
     newMaxLineY,
@@ -4299,13 +4410,15 @@ const replaceAllInFocusedFile = async (state, fileIndex) => {
     fileCount: newFileCount,
     fileIconCache: newFileIconCache,
     finalDeltaY,
+    headerHeight,
     icons,
     items: newItems,
     listFocusedIndex: newFocusedIndex,
     listItems: newItems,
     matchCount: newMatchCount,
     maxLineY: newMaxLineY,
-    message: getReplacedMessage(1, matchCount, replacement),
+    message,
+    messageHeight,
     minLineY: newMinLineY,
     scrollBarHeight
   };
@@ -4341,12 +4454,18 @@ const replaceAllConfirmed = async (state, fileIndex) => {
   await handleWorkspaceRefresh();
   const fileCount = bulkEdits.length;
   const message = getReplacedMessage(fileCount, matchCount, replacement);
+  const {
+    headerHeight,
+    messageHeight
+  } = await getSearchMessageLayout(state, message);
   return {
     ...state,
+    headerHeight,
     items: [],
     listItems: [],
     maxLineY: 0,
     message,
+    messageHeight,
     minLineY: 0
   };
 };
@@ -4374,11 +4493,13 @@ const replaceAllWithProgress = async context => {
     return;
   }
   const message = getReplacingMessage(fileCount, matchCount);
+  const messageLayout = await getSearchMessageLayout(state, message);
   await context.updateState(latestState => ({
     ...latestState,
+    ...messageLayout,
     message
   }));
-  await invoke$2('Search.rerender');
+  await invoke$3('Search.rerender');
   const updatedState = await replaceAllConfirmed(context.getState(), fileIndex);
   await context.updateState(() => updatedState);
 };
@@ -4393,7 +4514,7 @@ const toggleContextLines = async state => {
   };
 };
 
-const toggleDetailsExpanded = state => {
+const toggleDetailsExpanded = async state => {
   const {
     flags
   } = state;
@@ -4887,10 +5008,10 @@ const isConnected = () => {
   return connected;
 };
 const invoke = (method, ...params) => {
-  return invoke$3(method, ...params);
+  return invoke$4(method, ...params);
 };
 const set = rpc => {
-  set$4(rpc);
+  set$5(rpc);
   state.connected = true;
 };
 
@@ -4901,7 +5022,7 @@ const handleMessagePort = async (port, viewletCommandMap, setAsRendererProcess =
       throw new TypeError(`Viewlet command not found: ${command}`);
     }
     await fn(uid, ...args);
-    await invoke$2('Viewlet.requestRender', uid);
+    await invoke$3('Viewlet.requestRender', uid);
   };
   const rpc = await create$7({
     commandMap: {
@@ -4915,7 +5036,7 @@ const handleMessagePort = async (port, viewletCommandMap, setAsRendererProcess =
 };
 
 const openFolder = async () => {
-  await invoke$2('Dialog.openFolder');
+  await invoke$3('Dialog.openFolder');
 };
 
 const handleOpenFolderClick = async state => {
@@ -4926,7 +5047,6 @@ const handleOpenFolderClick = async state => {
 const handlePullResultsFound = async (state, resultSearchId, newResults) => {
   const {
     fileIconCache,
-    headerHeight,
     height,
     itemHeight,
     listItems,
@@ -4943,6 +5063,10 @@ const handlePullResultsFound = async (state, resultSearchId, newResults) => {
     resultCount
   } = getTextSearchResultCounts(allResults);
   const message = getStatusMessage(resultCount, fileCount);
+  const {
+    headerHeight,
+    messageHeight
+  } = await getSearchMessageLayout(state, message);
   const total = allResults.length;
   const contentHeight = total * itemHeight;
   const listHeight = height - headerHeight;
@@ -4961,6 +5085,7 @@ const handlePullResultsFound = async (state, resultSearchId, newResults) => {
     fileCount,
     fileIconCache: newFileIconCache,
     finalDeltaY,
+    headerHeight,
     icons,
     items: allResults,
     listItems: allResults,
@@ -4968,12 +5093,13 @@ const handlePullResultsFound = async (state, resultSearchId, newResults) => {
     matchCount: resultCount,
     maxLineY,
     message,
+    messageHeight,
     minLineY: 0,
     scrollBarHeight
   };
   const oldState = latest ? latest.oldState : state;
   set$1(uid, oldState, updatedState);
-  await invoke$2('Search.rerender');
+  await invoke$3('Search.rerender');
   return state;
 };
 
@@ -4985,11 +5111,16 @@ const handleResize = async (state, x, y, width, height) => {
   const {
     deltaY,
     fileIconCache,
-    headerHeight,
+    flags,
+    headerHeight: oldHeaderHeight,
     itemHeight,
     listItems,
+    message,
+    messageHeight: oldMessageHeight,
     minimumSliderSize
   } = state;
+  const messageHeight = await getSearchMessageHeight(message, width, flags);
+  const headerHeight = oldHeaderHeight + messageHeight - oldMessageHeight;
   const total = listItems.length;
   const contentHeight = total * itemHeight;
   const listHeight = height - headerHeight;
@@ -5010,9 +5141,11 @@ const handleResize = async (state, x, y, width, height) => {
     deltaY: newDeltaY,
     fileIconCache: newFileIconCache,
     finalDeltaY,
+    headerHeight,
     height,
     icons,
     maxLineY,
+    messageHeight,
     minLineY,
     scrollBarHeight,
     scrollBarY,
@@ -5028,14 +5161,21 @@ const handleSharedInput = (state, name, value, inputSource = Script) => {
 };
 
 const handleWorkspaceChange = (state, workspacePath) => {
+  const {
+    headerHeight: oldHeaderHeight,
+    messageHeight: oldMessageHeight
+  } = state;
+  const headerHeight = oldHeaderHeight + Minimum - oldMessageHeight;
   return {
     ...state,
     deltaY: 0,
+    headerHeight,
     items: [],
     listItems: [],
     matchCount: 0,
     maxLineY: 0,
     message: '',
+    messageHeight: Minimum,
     minLineY: 0,
     replacement: '',
     value: '',
@@ -5043,40 +5183,40 @@ const handleWorkspaceChange = (state, workspacePath) => {
   };
 };
 
-const send$1 = async port => {
+const send$2 = async port => {
   await sendMessagePortToIconThemeWorker(port, 0);
 };
 const launchIconThemeWorker = async () => {
   // TODO connect to icon theme worker
   const rpc = await create$5({
     commandMap: {},
-    send: send$1
+    send: send$2
   });
   return rpc;
 };
 
 const initializeIconThemeWorker = async () => {
   const rpc = await launchIconThemeWorker();
-  set$5(rpc);
+  set$6(rpc);
 };
 
 const commandMap$1 = {
   'TextSearch.handlePullResultsFound': wrapCommand(handlePullResultsFound)
 };
 
-const send = async port => {
+const send$1 = async port => {
   await sendMessagePortToTextSearchWorker(port, 0);
 };
 const launchTextSearchWorker = async () => {
   return create$5({
     commandMap: commandMap$1,
-    send
+    send: send$1
   });
 };
 
 const initializeTextSearchWorker = async () => {
   const rpc = await launchTextSearchWorker();
-  set$2(rpc);
+  set$3(rpc);
 };
 
 const initialize = async () => {
@@ -5618,6 +5758,7 @@ const loadContent = async (state, savedState) => {
   const {
     defaultExcludes: currentDefaultExcludes,
     limitHitWarning,
+    messageHeight,
     width
   } = state;
   const {
@@ -5632,7 +5773,7 @@ const loadContent = async (state, savedState) => {
   const defaultExcludes = await getSearchExcludes(currentDefaultExcludes);
   const usePullBasedSearch = await getUsePullBasedSearch();
   const warningHeight = await getSearchWarningMessageHeight(limitHitWarning, width);
-  const headerHeight = getTopHeight(flags) + warningHeight;
+  const headerHeight = getSearchHeaderHeight(flags, messageHeight, warningHeight);
   const update = {
     collapsedPaths: savedCollapsedPaths,
     defaultExcludes,
@@ -5900,11 +6041,12 @@ const getScrollBarThumbTopRule = scrollBarY => {
   transform: translateY(${roundedScrollBarY}px);
 }`;
 };
-const getCss = (top, uniqueIndents, uniqueIndentRights, scrollBarHeight, scrollBarY, treeItemsTop, headerHeight = 0) => {
+const getCss = (top, uniqueIndents, uniqueIndentRights, scrollBarHeight, scrollBarY, treeItemsTop, headerHeight = 0, messageHeight = 30) => {
   const rules = [`.Search {
   --ScrollBarHeight: ${scrollBarHeight}px;
   --ScrollBarTop: ${scrollBarY}px;
   --TreeItemsTop: ${top}px;
+  --SearchMessageHeight: ${messageHeight}px;
 }
 
 .SearchHeader {
@@ -5912,6 +6054,10 @@ const getCss = (top, uniqueIndents, uniqueIndentRights, scrollBarHeight, scrollB
   height: ${headerHeight}px;
 }
 
+.Search .SearchHeaderDetails {
+  height: var(--SearchMessageHeight);
+}
+
 .SearchWorkspaceMessageAction {
   appearance: none;
   background-color: transparent;
@@ -5966,6 +6112,7 @@ const PaddingRight = 12;
 const renderCss = (oldState, newState) => {
   const {
     headerHeight,
+    messageHeight,
     uid
   } = newState;
   const viewModel = createViewModel(newState);
@@ -5973,7 +6120,7 @@ const renderCss = (oldState, newState) => {
   const uniqueIndents = getUniqueIndents(indents);
   const uniqueIndentRights = [PaddingRight];
   const treeItemsTop = viewModel.itemHeight === 0 ? 0 : Math.round(-(viewModel.deltaY % viewModel.itemHeight));
-  const css = getCss(0, uniqueIndents, uniqueIndentRights, viewModel.scrollBarHeight, viewModel.scrollBarY, treeItemsTop, headerHeight);
+  const css = getCss(0, uniqueIndents, uniqueIndentRights, viewModel.scrollBarHeight, viewModel.scrollBarY, treeItemsTop, headerHeight, messageHeight);
   return [SetCss, uid, css];
 };
 
@@ -6734,16 +6881,16 @@ const renderSelections = (oldState, newState) => {
 };
 
 const renderValue = (oldState, newState) => {
-  return [SetValueByName, SearchValue, newState.value];
+  return [SetValueByName, newState.uid, SearchValue, newState.value];
 };
 const renderReplacement = (oldState, newState) => {
-  return [SetValueByName, ReplaceValue, newState.replacement];
+  return [SetValueByName, newState.uid, ReplaceValue, newState.replacement];
 };
 const renderIncludeValue = (oldState, newState) => {
-  return [SetValueByName, FilesToInclude, newState.includeValue];
+  return [SetValueByName, newState.uid, FilesToInclude, newState.includeValue];
 };
 const renderExcludeValue = (oldState, newState) => {
-  return [SetValueByName, FilesToExclude, newState.excludeValue];
+  return [SetValueByName, newState.uid, FilesToExclude, newState.excludeValue];
 };
 
 const getRenderer = diffType => {
@@ -7002,12 +7149,12 @@ const rerender = state => {
 };
 
 const revealInExplorerActual = async uri => {
-  await invoke$2('SideBar.show', 'Explorer');
-  const states = await invoke$2('Viewlet.getAllStates');
+  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$2('Viewlet.executeViewletCommand', explorerUid, 'reveal', uri);
+  await invoke$3('Viewlet.executeViewletCommand', explorerUid, 'reveal', uri);
 };
 const revealInExplorer = async (state, uri) => {
   await revealInExplorerActual(uri);
@@ -7305,17 +7452,28 @@ const commandMap = {
   'TextSearch.viewAsTree': wrapCommand(viewAsTree)
 };
 
+const send = port => {
+  return sendMessagePortToTextMeasurementWorker(port);
+};
+const initializeTextMeasurementWorker = async () => {
+  const rpc = await create$5({
+    commandMap: {},
+    send
+  });
+  set$2(rpc);
+};
+
 const listen = async () => {
   registerCommands(commandMap);
   const rpc = await create$4({
     commandMap: commandMap
   });
-  set$3(rpc);
-  const dialogRpc = await create$5({
+  set$4(rpc);
+  const [dialogRpc] = await Promise.all([create$5({
     commandMap: {},
     send: sendMessagePortToDialogWorker
-  });
-  set$6(dialogRpc);
+  }), initializeTextMeasurementWorker()]);
+  set$7(dialogRpc);
 };
 
 const main = async () => {