@lvce-editor/static-server 0.61.0 → 0.61.2

package/static/{9326233 → 45a12ea}/packages/text-search-worker/dist/textSearchWorkerMain.js

@@ -1143,6 +1143,9 @@ const createMockRpc = ({
   const invoke = (method, ...params) => {
     invocations.push([method, ...params]);
     const command = commandMap[method];
+    if (!command) {
+      throw new Error(`command ${method} not found`);
+    }
     return command(...params);
   };
   const mockRpc = {
@@ -1465,6 +1468,11 @@ const sendMessagePortToMarkdownWorker = async (port, rpcId) => {
   // @ts-ignore
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToMarkdownWorker', port, command, rpcId);
 };
+const sendMessagePortToIconThemeWorker = async (port, rpcId) => {
+  const command = 'IconTheme.handleMessagePort';
+  // @ts-ignore
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToIconThemeWorker', port, command, rpcId);
+};
 const sendMessagePortToFileSystemWorker = async (port, rpcId) => {
   const command = 'FileSystem.handleMessagePort';
   // @ts-ignore
@@ -1731,6 +1739,7 @@ const RendererWorker = {
   sendMessagePortToErrorWorker,
   sendMessagePortToExtensionHostWorker,
   sendMessagePortToFileSystemWorker,
+  sendMessagePortToIconThemeWorker,
   sendMessagePortToMarkdownWorker,
   sendMessagePortToRendererProcess,
   sendMessagePortToSearchProcess: sendMessagePortToSearchProcess$1,
@@ -1805,7 +1814,9 @@ const minimumSliderSize = 20;
 const {
   get: get$1,
   set,
-  wrapCommand
+  wrapCommand,
+  registerCommands,
+  getCommandIds
 } = create$3();
 
 const List = 1;
@@ -1881,7 +1892,10 @@ const create = (uid, x, y, width, height, workspacePath, assetDir, itemHeight, v
     incrementalSearch: false,
     searchId: '',
     useChevrons: true,
-    useFileIcons: true
+    useFileIcons: true,
+    limitHit: false,
+    limitHitWarning: '',
+    limit: 20_000
   };
   set(uid, state, state);
   return state;
@@ -2004,6 +2018,7 @@ const ToggleSearchDetails$1 = 'Toggle Search Details';
 const UseExcludeSettings$1 = 'Use Exclude Settings';
 const UseRegularExpression$1 = 'Use Regular Expression';
 const ViewAsTree = 'View as Tree';
+const TheResultSetOnlyContainsASubSetOfMatches = 'The result set only contains a subset of all matches. Be more specific in your search to narrow down the results.';
 
 const noResults = () => {
   return i18nString(NoResults);
@@ -2096,6 +2111,9 @@ const replaceAll$1 = () => {
 const replace = () => {
   return i18nString(Replace);
 };
+const theResultSetOnlyContainsASubSetOfMatches = () => {
+  return i18nString(TheResultSetOnlyContainsASubSetOfMatches);
+};
 const refresh$1 = () => {
   return i18nString(Refresh$1);
 };
@@ -2415,12 +2433,6 @@ const focusSearchValueNext = state => {
   return focusMatchCase$1(state);
 };
 
-const commandIds = ['clearSearchResults', 'collapseAll', 'collapseDetails', 'copy', 'dismissItem', 'dispose', 'expandDetails', 'focusFirst', 'focusIndex', 'focusLast', 'focusMatchCase', 'focusMatchCasePrevious', 'focusMatchWholeWord', 'focusNext', 'focusNextInput', 'focusNextPage', 'focusPreserveCasePrevious', 'focusPrevious', 'focusPreviousInput', 'focusPreviousPage', 'focusRegex', 'focusRegexNext', 'focusReplaceAll', 'focusReplaceValue', 'focusReplaceValueNext', 'focusReplaceValuePrevious', 'focusSearchValue', 'focusSearchValueNext', 'handleClick', 'handleClickAt', 'handleContextMenu', 'handleContextMenuKeyboard', 'handleContextMenuMouseAt', 'handleExcludeInput', 'handleFocusIn', 'handleHeaderClick', 'handleHeaderContextMenu', 'handleHeaderFocusIn', 'handleHeaderFocusOut', 'handleIconThemeChange', 'handleIconThemeChange', 'handleIncludeInput', 'handleInput', 'handleInput2', 'handleListBlur', 'handleListFocus', 'handleReplaceInput', 'handleScrollBarCaptureLost', 'handleScrollBarClick', 'handleScrollBarMove', 'handleScrollBarThumbPointerMove', 'handleTouchEnd', 'handleTouchMove', 'handleTouchStart', 'handleUpdate', 'handleWheel', 'nextHistoryResult', 'previousHistoryResult', 'refresh', 'replaceAll', 'rerender', 'scrollDown', 'selectIndex', 'submit', 'toggleMatchCase', 'toggleMatchWholeWord', 'togglePreserveCase', 'toggleReplace', 'toggleSearchDetails', 'toggleUseRegularExpression', 'viewAsTree'];
-
-const getCommandIds = () => {
-  return commandIds;
-};
-
 const Tab = 2;
 const Enter = 3;
 const End = 255;
@@ -2637,11 +2649,15 @@ const handleUpdateFull = async (state, update) => {
     includeValue,
     excludeValue,
     assetDir,
-    platform
+    platform,
+    limit
   } = partialNewState;
   const root = state.workspacePath;
   const scheme = getProtocol(root);
-  const results = await textSearch$6(root, value, {
+  const {
+    results,
+    limitHit
+  } = await textSearch$6(root, value, {
     threads,
     isCaseSensitive: Boolean(flags & MatchCase$2),
     useRegularExpression: Boolean(flags & UseRegularExpression$2),
@@ -2652,7 +2668,8 @@ const handleUpdateFull = async (state, update) => {
     query: value,
     scheme,
     flags,
-    matchWholeWord: Boolean(flags & MatchWholeWord$2)
+    matchWholeWord: Boolean(flags & MatchWholeWord$2),
+    limit
   }, assetDir, platform);
   if (!Array.isArray(results)) {
     throw new TypeError('results must be of type array');
@@ -2671,23 +2688,29 @@ const handleUpdateFull = async (state, update) => {
   const finalDeltaY = Math.max(contentHeight - listHeight, 0);
   const visible = results.slice(0, maxLineY);
   const icons = await getFileIcons(visible);
+
+  // TODO add info message if limit was hit
+
+  const limitHitWarning = limitHit ? theResultSetOnlyContainsASubSetOfMatches() : '';
   return {
     ...partialNewState,
-    minLineY: 0,
     deltaY: 0,
-    value,
+    fileCount,
+    finalDeltaY,
+    icons,
     items: results,
+    limitHit,
+    limitHitWarning,
     listItems: results,
-    message,
+    loaded: true,
+    matchCount: resultCount,
     maxLineY: maxLineY,
+    message,
+    minLineY: 0,
     scrollBarHeight,
-    finalDeltaY,
+    searchInputErrorMessage: '',
     threads,
-    fileCount,
-    matchCount: resultCount,
-    loaded: true,
-    icons,
-    searchInputErrorMessage: ''
+    value
   };
 };
 
@@ -2786,6 +2809,7 @@ const handleUpdateIncremental = async (state, update) => {
     threads,
     includeValue,
     excludeValue,
+    limit,
     uid,
     assetDir,
     platform
@@ -2813,7 +2837,8 @@ const handleUpdateIncremental = async (state, update) => {
     query: value,
     scheme,
     flags,
-    matchWholeWord: Boolean(flags & MatchWholeWord$2)
+    matchWholeWord: Boolean(flags & MatchWholeWord$2),
+    limit
   }, assetDir, platform, searchId, uid);
   return state;
 };
@@ -3901,6 +3926,8 @@ const getDisplayResults = (results, itemHeight, resultCount, searchTerm, minLine
 };
 
 const createViewModel = state => {
+  // TODO add viewmodel to state, not needing to have separate states and making it easier to compare
+  // visible items in diff
   const {
     listItems,
     itemHeight,
@@ -4415,6 +4442,26 @@ const getSearchHeaderDetailsVirtualDom = (flags, message) => {
   return getSearchHeaderDetailsCollapsedVirtualDom(message);
 };
 
+const SearchWarningMessage = 'SearchWarningMessage';
+
+const getSearchHeaderLimitHitVirtualDom = limitHitWarning => {
+  if (!limitHitWarning) {
+    // TODO remove unused dom node
+    return [{
+      type: Div,
+      childCount: 0
+    }];
+  }
+  const dom = [{
+    type: Div,
+    className: SearchWarningMessage,
+    childCount: 1
+  },
+  // TODO warning triangle here
+  text(limitHitWarning)];
+  return dom;
+};
+
 const getInputActionsInput = flags => {
   const inside = [{
     icon: MaskIconCaseSensitive,
@@ -4516,14 +4563,14 @@ const parentNode = {
   type: Div,
   className: SearchHeader,
   role: None,
-  childCount: 2,
+  childCount: 3,
   onClick: HandleHeaderClick2,
   onFocusIn: HandleHeaderFocusIn,
   onFocusOut: HandleHeaderFocusOut,
   onContextMenu: HandleHeaderContextMenu
 };
-const getSearchHeaderVirtualDom = (flags, message, searchInputErrorMessage, matchCount, focus) => {
-  const dom = [parentNode, ...getSearchHeaderTopVirtualDom(flags, searchInputErrorMessage, matchCount, focus), ...getSearchHeaderDetailsVirtualDom(flags, message)];
+const getSearchHeaderVirtualDom = (flags, message, searchInputErrorMessage, matchCount, focus, limitHitWarning) => {
+  const dom = [parentNode, ...getSearchHeaderTopVirtualDom(flags, searchInputErrorMessage, matchCount, focus), ...getSearchHeaderDetailsVirtualDom(flags, message), ...getSearchHeaderLimitHitVirtualDom(limitHitWarning)];
   return dom;
 };
 
@@ -4770,19 +4817,19 @@ const getSearchResultsVirtualDom = (visibleItems, focusOutline, scrollbarHeight,
   }, ...getTreeItemsVirtualDom(visibleItems, deltaY, itemHeight), ...getScrollBarVirtualDom(scrollbarHeight, scrollBarY, scrollBarValue)];
 };
 
-const getSearchVirtualDom = (visibleItems, flags, message, focusOutline, searchInputErrorMessage, scrollBarHeight, scrollBarY, scrollBarValue, deltaY, itemHeight, matchCount, focus = 0) => {
+const getSearchVirtualDom = (visibleItems, flags, message, focusOutline, searchInputErrorMessage, scrollBarHeight, scrollBarY, scrollBarValue, deltaY, itemHeight, matchCount, limitHitWarning, focus = 0) => {
   const errorDom = getSearchInputErrorVirtualDom(searchInputErrorMessage);
   const childCount = 2 + (errorDom.length > 0 ? 1 : 0);
   return [{
     type: Div,
     className: mergeClassNames(Viewlet, Search$2),
     childCount
-  }, ...getSearchHeaderVirtualDom(flags, message, searchInputErrorMessage, matchCount, focus), ...errorDom, ...getSearchResultsVirtualDom(visibleItems, focusOutline, scrollBarHeight, scrollBarY, scrollBarValue, deltaY, itemHeight)];
+  }, ...getSearchHeaderVirtualDom(flags, message, searchInputErrorMessage, matchCount, focus, limitHitWarning), ...errorDom, ...getSearchResultsVirtualDom(visibleItems, focusOutline, scrollBarHeight, scrollBarY, scrollBarValue, deltaY, itemHeight)];
 };
 
 const renderItems = (oldState, newState) => {
   const viewModel = createViewModel(newState);
-  const dom = getSearchVirtualDom(viewModel.displayResults, viewModel.flags, viewModel.message, viewModel.focusOutline, viewModel.searchInputErrorMessage, viewModel.scrollBarHeight, viewModel.scrollBarY, viewModel.scrollBarValue, viewModel.deltaY, viewModel.itemHeight, viewModel.matchCount, viewModel.focus);
+  const dom = getSearchVirtualDom(viewModel.displayResults, viewModel.flags, viewModel.message, viewModel.focusOutline, viewModel.searchInputErrorMessage, viewModel.scrollBarHeight, viewModel.scrollBarY, viewModel.scrollBarValue, viewModel.deltaY, viewModel.itemHeight, viewModel.matchCount, newState.limitHitWarning, viewModel.focus);
   return ['Viewlet.setDom2', newState.uid, dom];
 };
 
@@ -4984,7 +5031,7 @@ const getDom = state => {
   const focusOutline = state.listFocused && state.listFocusedIndex === -1;
   const scrollBarValue = state.deltaY / state.finalDeltaY * 100;
   const scrollBarY = getScrollBarY$1(state.deltaY, state.finalDeltaY, state.height - state.headerHeight, state.scrollBarHeight);
-  const dom = getSearchVirtualDom(displayResults, state.flags, state.message, focusOutline, state.searchInputErrorMessage, state.scrollBarHeight, scrollBarY, scrollBarValue, state.deltaY, state.itemHeight, state.matchCount, state.focus);
+  const dom = getSearchVirtualDom(displayResults, state.flags, state.message, focusOutline, state.searchInputErrorMessage, state.scrollBarHeight, scrollBarY, scrollBarValue, state.deltaY, state.itemHeight, state.matchCount, state.limitHitWarning, state.focus);
   return dom;
 };
 
@@ -5165,6 +5212,12 @@ const focusReplaceAll = state => {
   return focusElement(state, FocusSearchReplaceAll);
 };
 
+const setLimit = (state, limit) => {
+  return handleUpdate(state, {
+    limit
+  });
+};
+
 const getNewHistory = (history, newValue) => {
   const newHistory = [...history, newValue];
   const maxHistoryLength = 100;
@@ -5294,6 +5347,7 @@ const commandMap = {
   'TextSearch.toggleUseIgnoreFiles': wrapCommand(toggleUseIgnoreFiles),
   'TextSearch.toggleUseRegularExpression': wrapCommand(toggleUseRegularExpression),
   'TextSearch.viewAsTree': wrapCommand(viewAsTree),
+  'TextSearch.setLimit': wrapCommand(setLimit),
   // not wrapped
   'TextSearch.initialize': initialize,
   'TextSearch.create': create,
@@ -5314,20 +5368,44 @@ const commandMap = {
 const textSearch$5 = async (scheme, root, query) => {
   string(scheme);
   string(query);
-  const result = await invoke$1('ExtensionHostTextSearch.executeTextSearchProvider', scheme, query);
-  return result;
+  const results = await invoke$1('ExtensionHostTextSearch.executeTextSearchProvider', scheme, query);
+  return {
+    results,
+    limitHit: false
+  };
 };
 
 const textSearch$4 = async (scheme, root, query, options, assetDir) => {
-  return invoke$1('ExtensionHostTextSearch.textSearchFetch', scheme, root, query, options, assetDir);
+  const results = await invoke$1('ExtensionHostTextSearch.textSearchFetch', scheme, root, query, options, assetDir);
+  return {
+    results,
+    limitHit: false
+  };
 };
 
 const textSearch$3 = async (scheme, root, query) => {
-  return invoke$1('ExtensionHostTextSearch.textSearchHtml', scheme, root, query);
+  const results = await invoke$1('ExtensionHostTextSearch.textSearchHtml', scheme, root, query);
+  return {
+    results,
+    limitHit: false
+  };
 };
 
 const textSearch$2 = async (scheme, root, query, options, assetDir) => {
-  return invoke$1('ExtensionHostTextSearch.textSearchMemory', scheme, root, query, options, assetDir);
+  try {
+    // @ts-ignore
+    const result = await invoke$1('ExtensionHostTextSearch.textSearchMemory2', scheme, root, query, options, assetDir);
+    if (!result || !result.results) {
+      throw new Error(`new api not supported`);
+    }
+    return result;
+  } catch {
+    const results = await invoke$1('ExtensionHostTextSearch.textSearchMemory', scheme, root, query, options, assetDir);
+    return {
+      results,
+      limitHit: false
+    };
+  }
 };
 
 const textSearch$1 = async (scheme, root, query, options, assetDir, platform) => {
@@ -5341,14 +5419,18 @@ const textSearch$1 = async (scheme, root, query, options, assetDir, platform) =>
   };
   if (platform === Remote || platform === Electron) {
     const result = await invoke('TextSearch.search', actualOptions);
-    // TODO api is weird
-    // @ts-ignore
-    return result.results;
+    return {
+      results: result.results,
+      limitHit: result.limitHit
+    };
   }
   // TODO always create search process messageport rpc to have one api, in web can send the messageport to renderer worker
-  const results = await invoke$1('SearchProcess.invoke', 'TextSearch.search', actualOptions);
+  const result = await invoke$1('SearchProcess.invoke', 'TextSearch.search', actualOptions);
   // TODO api is weird
-  return results.results;
+  return {
+    results: result.results,
+    limitHit: result.limitHit
+  };
 };
 
 const textSearch = async (scheme, root, query) => {
@@ -5364,7 +5446,10 @@ const textSearch = async (scheme, root, query) => {
       }]]);
     }
   }
-  return results;
+  return {
+    results,
+    limitHit: false
+  };
 };
 
 const textSearchProviderMap = {
@@ -5379,6 +5464,7 @@ const textSearchProviderMap = {
 };
 
 const listen = async () => {
+  registerCommands(commandMap);
   add(textSearchProviderMap);
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap

package/static/index.html

@@ -6,9 +6,9 @@
     <meta name="description" content="VS Code inspired text editor that mostly runs in a webworker." />
     <meta name="theme-color" content="#282e2f" />
     <title>Lvce Editor</title>
-    <link rel="stylesheet" href="/9326233/css/App.css" />
-    <link rel="manifest" href="/9326233/manifest.json" crossorigin="use-credentials" />
-    <link rel="apple-touch-icon" href="/9326233/icons/pwa-icon-192.png" />
-    <script type="module" src="/9326233/packages/renderer-process/dist/rendererProcessMain.js"></script>
+    <link rel="stylesheet" href="/45a12ea/css/App.css" />
+    <link rel="manifest" href="/45a12ea/manifest.json" crossorigin="use-credentials" />
+    <link rel="apple-touch-icon" href="/45a12ea/icons/pwa-icon-192.png" />
+    <script type="module" src="/45a12ea/packages/renderer-process/dist/rendererProcessMain.js"></script>
   </head>
 </html>