@lvce-editor/text-search-view 1.5.0 → 1.7.0

package/dist/textSearchViewMain.js

@@ -1135,7 +1135,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$4 = (id, rpc) => {
+const set$5 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1168,7 +1168,7 @@ const create$3 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$4(rpcId, mockRpc);
+      set$5(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove$2(rpcId);
@@ -1177,7 +1177,7 @@ const create$3 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$4(rpcId, rpc);
+      set$5(rpcId, rpc);
     }
   };
 };
@@ -1443,6 +1443,7 @@ const None$1 = 0;
 
 const LeftClick = 0;
 
+const DialogWorker = 7014;
 const IconThemeWorker = 7009;
 const RendererWorker = 1;
 const TextSearchWorker = 7010;
@@ -1473,6 +1474,11 @@ const FocusSearchWholeWord = 34;
 const FocusToggleDetails = 1010;
 const FocusToggleReplace = 1020;
 
+const {
+  invoke: invoke$3,
+  set: set$4
+} = create$3(DialogWorker);
+
 const {
   invoke: invoke$2,
   set: set$3
@@ -1498,6 +1504,10 @@ const sendMessagePortToTextSearchWorker = async (port, rpcId) => {
   const command = 'HandleMessagePort.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToTextSearchWorker', port, command, rpcId);
 };
+const sendMessagePortToDialogWorker = async port => {
+  const command = 'HandleMessagePort.handleMessagePort';
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToDialogWorker', port, command);
+};
 const sendMessagePortToIconThemeWorker = async (port, rpcId) => {
   const command = 'IconTheme.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToIconThemeWorker', port, command, rpcId);
@@ -2076,9 +2086,13 @@ 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 === Match$1) {
+    if (dirent.type !== File) {
       return '';
     }
     const path = getFilePath(dirent.text);
@@ -2094,9 +2108,6 @@ const getFileName = path => {
   return path.slice(slashIndex + 1);
 };
 
-const File = 1;
-const Match = 2;
-
 const isFile = match => {
   return match.type === File;
 };
@@ -2190,7 +2201,7 @@ const getFilteredResults = (results, collapsedPaths) => {
       filteredResults.push(result);
       isExcluded = collapsedPaths.includes(result.text) ? true : false;
     }
-    if (result.type === Match && !isExcluded) {
+    if ((result.type === Match || result.type === Context) && !isExcluded) {
       filteredResults.push(result);
     }
   }
@@ -2291,6 +2302,9 @@ const hasReplaceExpanded = flags => {
 const hasDetailsExpanded = flags => {
   return (flags & DetailsExpanded) === DetailsExpanded;
 };
+const hasOpenEditors = flags => {
+  return (flags & OpenEditors) === OpenEditors;
+};
 const hasUseIgnoreFiles = flags => {
   return (flags & UseIgnoreFiles) === UseIgnoreFiles;
 };
@@ -2418,7 +2432,6 @@ const copyPath$1 = async state => {
 };
 
 const defaultExcludes = ['.git', 'node_modules'];
-defaultExcludes.join(',');
 
 const minimumSliderSize = 20;
 
@@ -2547,16 +2560,6 @@ 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;
 };
 
-const RenderFocus = 2;
-const RenderValue = 3;
-const RenderReplaceValue = 4;
-const RenderIncludeValue = 5;
-const RenderExcludeValue = 6;
-const RenderFocusContext = 7;
-const RenderSelections = 8;
-const RenderIncremental = 9;
-const RenderCss = 10;
-
 const isEqual$6 = (oldState, newState) => {
   return oldState.excludeValue === newState.excludeValue || newState.inputSource === User;
 };
@@ -2581,6 +2584,16 @@ const isEqual$1 = (oldState, newState) => {
   return oldState.replacement === newState.replacement || newState.inputSource === User;
 };
 
+const RenderFocus = 2;
+const RenderValue = 3;
+const RenderReplaceValue = 4;
+const RenderIncludeValue = 5;
+const RenderExcludeValue = 6;
+const RenderFocusContext = 7;
+const RenderSelections = 8;
+const RenderIncremental = 9;
+const RenderCss = 10;
+
 const isEqual = (oldState, newState) => {
   return oldState.value === newState.value || newState.inputSource === User;
 };
@@ -2649,12 +2662,25 @@ const getSetSize = (items, index) => {
   }
   return setSize;
 };
+const getMatchCount$1 = (items, index) => {
+  let matchCount = 0;
+  for (let i = index + 1; i < items.length; i++) {
+    if (items[i].type === File) {
+      break;
+    }
+    if (items[i].type === Match) {
+      matchCount++;
+    }
+  }
+  return matchCount;
+};
 const getRemoveIndicesFile = (items, item, index, matchCount, fileCount) => {
   const setSize = getSetSize(items, index);
+  const removedMatchCount = getMatchCount$1(items, index);
   return {
     newFileCount: fileCount - 1,
     newFocusedIndex: index + setSize + 1 < items.length ? index : index - 1,
-    newMatchCount: matchCount - setSize,
+    newMatchCount: matchCount - removedMatchCount,
     removeCount: setSize + 1,
     startIndex: index
   };
@@ -2683,9 +2709,20 @@ const getRemoveIndicesMatch = (items, index, matchCount, fileCount) => {
   }
   throw new Error('could not compute indices to remove');
 };
+const getRemoveIndicesContext = (index, matchCount, fileCount) => {
+  return {
+    newFileCount: fileCount,
+    newFocusedIndex: index,
+    newMatchCount: matchCount,
+    removeCount: 1,
+    startIndex: index
+  };
+};
 const getRemoveIndices = (items, index, matchCount, fileCount) => {
   const item = items[index];
   switch (item.type) {
+    case Context:
+      return getRemoveIndicesContext(index, matchCount, fileCount);
     case File:
       return getRemoveIndicesFile(items, item, index, matchCount, fileCount);
     case Match:
@@ -3593,7 +3630,14 @@ const getTextSearchResultCounts = results => {
 };
 
 const textSearch = async (root, query, options, assetDir, platform, searchId, uid) => {
-  return search$1(root, query, options, assetDir, platform, searchId, uid);
+  if (!hasOpenEditors(options.flags)) {
+    return search$1(root, query, options, assetDir, platform, searchId, uid);
+  }
+  const openEditorUris = await invoke$1('GetActiveEditor.getOpenEditorUris');
+  return search$1(root, query, {
+    ...options,
+    openEditorUris
+  }, assetDir, platform, searchId, uid);
 };
 
 const handleUpdateFull = async (state, update) => {
@@ -3606,6 +3650,8 @@ const handleUpdateFull = async (state, update) => {
   };
   const {
     assetDir,
+    contextLines,
+    contextLinesEnabled,
     excludeValue,
     fileIconCache,
     flags,
@@ -3631,6 +3677,7 @@ const handleUpdateFull = async (state, update) => {
     results
   } = await textSearch(root, value, {
     assetDir,
+    contextLines: contextLinesEnabled ? contextLines : 0,
     defaultExcludes: hasUseIgnoreFiles(flags) ? partialNewState.defaultExcludes : [],
     exclude: excludeValue,
     flags,
@@ -3749,6 +3796,8 @@ const handleUpdateIncremental = async (state, update) => {
   };
   const {
     assetDir,
+    contextLines,
+    contextLinesEnabled,
     excludeValue,
     flags,
     includeValue,
@@ -3773,6 +3822,7 @@ const handleUpdateIncremental = async (state, update) => {
   // TODO await promise?
   void textSearchIncremental(root, value, {
     assetDir: assetDir,
+    contextLines: contextLinesEnabled ? contextLines : 0,
     defaultExcludes: hasUseIgnoreFiles(flags) ? partialNewState.defaultExcludes : [],
     exclude: excludeValue,
     flags,
@@ -3812,6 +3862,8 @@ const handleUpdatePullBased = async (state, update) => {
   set(previousUid, state, partialNewState);
   const {
     assetDir,
+    contextLines,
+    contextLinesEnabled,
     excludeValue,
     flags,
     includeValue,
@@ -3831,6 +3883,7 @@ const handleUpdatePullBased = async (state, update) => {
     limitHit
   } = await textSearch(root, value, {
     assetDir,
+    contextLines: contextLinesEnabled ? contextLines : 0,
     defaultExcludes: hasUseIgnoreFiles(flags) ? partialNewState.defaultExcludes : [],
     exclude: excludeValue,
     flags,
@@ -4001,8 +4054,10 @@ const getReplaceElements = (items, workspacePath, replacement) => {
   for (const match of items) {
     const {
       end,
+      endColumnIndex,
       lineNumber,
       start,
+      startColumnIndex,
       text,
       type
     } = match;
@@ -4014,11 +4069,11 @@ const getReplaceElements = (items, workspacePath, replacement) => {
         changes,
         uri: absolutePath
       });
-    } else {
+    } else if (type === Match) {
       changes.push({
-        endColumnIndex: end,
+        endColumnIndex: endColumnIndex ?? end,
         endRowIndex: lineNumber,
-        startColumnIndex: start,
+        startColumnIndex: startColumnIndex ?? start,
         startRowIndex: lineNumber - 1,
         text: replacement
       });
@@ -4037,8 +4092,16 @@ const getReplacingMessage = (fileCount, replaceCount) => {
   return replacingManyOccurrencesInManyFiles(replaceCount, fileCount);
 };
 
-const prompt = (text, options) => {
-  return invoke$1('ConfirmPrompt.prompt', text, options);
+const missingDialogWorkerRelay = 'Command "SendMessagePortToExtensionHostWorker.sendMessagePortToDialogWorker" not found';
+const prompt = async (text, options) => {
+  try {
+    return await invoke$3('ConfirmPrompt.prompt', text, options);
+  } catch (error) {
+    if (!String(error).includes(missingDialogWorkerRelay)) {
+      throw error;
+    }
+    return invoke$1('ConfirmPrompt.prompt', text, options);
+  }
 };
 
 const getReplaceAllConfirmText = (matchCount, fileCount, replacement) => {
@@ -4724,13 +4787,15 @@ const handleListBlur = state => {
 
 const handleListFocus = async state => {
   const {
+    focus,
     listFocused
   } = state;
-  if (listFocused) {
+  if (focus === FocusSearchResults && listFocused) {
     return state;
   }
   return {
     ...state,
+    focus: FocusSearchResults,
     listFocused: true
   };
 };
@@ -5283,6 +5348,8 @@ const selectIndexPreview = async (state, searchResult, index) => {
 
 const getSelectHandler = type => {
   switch (type) {
+    case Context:
+      return selectIndexPreview;
     case File:
       return selectIndexFile;
     case Match:
@@ -5565,13 +5632,17 @@ const Collapsed = 1;
 const Expanded = 2;
 
 const getMatchCount = (results, startIndex) => {
+  let matchCount = 0;
   for (let i = startIndex + 1; i < results.length; i++) {
     const result = results[i];
     if (result.type === File) {
-      return i - startIndex - 1;
+      break;
+    }
+    if (result.type === Match) {
+      matchCount++;
     }
   }
-  return results.length - startIndex - 1;
+  return matchCount;
 };
 
 const defaultIndent = 12;
@@ -5640,6 +5711,8 @@ const getDisplayResult = (results, fileIcons, i, setSize, searchTermLength, repl
   const focused = i === focusedIndex;
   const relativeIndex = i - minLineY;
   switch (type) {
+    case Context:
+      return getDisplayResultMatch(setSize, 0, '', text, posInSet, 0, focused);
     case File:
       return getSearchDisplayResultFile(results, fileIcons, i, setSize, collapsedPaths, text, posInSet, relativeIndex, focused, renderFolderPaths, originalResults);
     case Match:
@@ -5890,8 +5963,8 @@ const getSearchHeaderDetailsCollapsedVirtualDom = message => {
 
 const CheckBoxEnabled = 1;
 const CheckBoxDisabled = 2;
-const ButtonEnabled = 2;
-const ButtonDisabled = 3;
+const ButtonEnabled = 3;
+const ButtonDisabled = 4;
 
 const getInputActionsExclude = flags => {
   const inside = [{
@@ -6469,12 +6542,12 @@ const getSearchResultsVirtualDom = (visibleItems, focusOutline, scrollbarHeight,
     childCount,
     className: mergeClassNames(Viewlet, List$1, Tree, focusOutline ? FocusOutline : Empty$1),
     onBlur: HandleListBlur,
+    onFocus: HandleListFocus,
     role: Tree$1,
     tabIndex: Focusable,
     type: Div
     // TODO renable this when dom diffing is supported
     // onPointerDown: HandleListPointerDown,
-    // onFocus: HandleListFocus,
   }, ...getTreeItemsVirtualDom(visibleItems, deltaY, itemHeight), ...getScrollBarVirtualDom(scrollbarHeight, scrollBarY, scrollBarValue)];
 };
 
@@ -7054,6 +7127,11 @@ const listen = async () => {
     commandMap: commandMap
   });
   set$2(rpc);
+  const dialogRpc = await create$5({
+    commandMap: {},
+    send: sendMessagePortToDialogWorker
+  });
+  set$4(dialogRpc);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/text-search-view",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "description": "Text Search View",
   "keywords": [
     "text-search"