@lvce-editor/text-search-view 1.1.0 → 1.2.1

package/dist/textSearchViewMain.js

@@ -1205,6 +1205,7 @@ const HighlightDeleted = 'HighlightDeleted';
 const HighlightInserted = 'HighlightInserted';
 const IconButton = 'IconButton';
 const IconButtonDisabled = 'IconButtonDisabled';
+const InputBox = 'InputBox';
 const Label$1 = 'Label';
 const List$1 = 'List';
 const MaskIcon = 'MaskIcon';
@@ -2457,7 +2458,7 @@ const create$1 = ({
   };
 };
 
-const create = (uid, x, y, width, height, workspacePath, assetDir, itemHeight, value = '', replacement = '', platform) => {
+const create = (uid, x, y, width, height, workspacePath, assetDir, itemHeight, value = '', replacement = '', platform, isSearchEditor = false) => {
   const headerHeight = getTopHeight(0);
   const state = {
     disposed: false,
@@ -2478,6 +2479,8 @@ const create = (uid, x, y, width, height, workspacePath, assetDir, itemHeight, v
     }),
     assetDir,
     collapsedPaths: [],
+    contextLines: 1,
+    contextLinesEnabled: false,
     defaultExcludes: defaultExcludes,
     deltaY: 0,
     excludeValue: '',
@@ -2495,6 +2498,7 @@ const create = (uid, x, y, width, height, workspacePath, assetDir, itemHeight, v
     includeValue: '',
     incrementalSearch: false,
     inputSource: User,
+    isSearchEditor,
     limit: 20_000,
     limitHit: false,
     limitHitWarning: '',
@@ -2570,7 +2574,7 @@ const isEqual$3 = (oldState, newState) => {
 };
 
 const isEqual$2 = (oldState, newState) => {
-  return oldState.collapsedPaths === newState.collapsedPaths && oldState.deltaY === newState.deltaY && oldState.flags === newState.flags && oldState.focus === newState.focus && oldState.icons === newState.icons && oldState.items === newState.items && oldState.listFocused === newState.listFocused && oldState.listFocusedIndex === newState.listFocusedIndex && oldState.loaded === newState.loaded && oldState.maxLineY === newState.maxLineY && oldState.message === newState.message && oldState.minLineY === newState.minLineY && oldState.renderFolderPaths === newState.renderFolderPaths && oldState.replacement === newState.replacement && oldState.searchInputErrorMessage === newState.searchInputErrorMessage;
+  return oldState.collapsedPaths === newState.collapsedPaths && oldState.contextLinesEnabled === newState.contextLinesEnabled && oldState.deltaY === newState.deltaY && oldState.flags === newState.flags && oldState.focus === newState.focus && oldState.icons === newState.icons && oldState.items === newState.items && oldState.isSearchEditor === newState.isSearchEditor && oldState.listFocused === newState.listFocused && oldState.listFocusedIndex === newState.listFocusedIndex && oldState.loaded === newState.loaded && oldState.maxLineY === newState.maxLineY && oldState.message === newState.message && oldState.minLineY === newState.minLineY && oldState.renderFolderPaths === newState.renderFolderPaths && oldState.replacement === newState.replacement && oldState.searchInputErrorMessage === newState.searchInputErrorMessage;
 };
 
 const isEqual$1 = (oldState, newState) => {
@@ -2758,6 +2762,8 @@ const MatchWholeWord$1 = 'Match Whole Word';
 const NoResults = 'No results found';
 const Oneresult = '1 result in 1 file';
 const OpenNewSearchEditor = 'Open New Search Editor';
+const ContextLines$1 = 'Context Lines';
+const ToggleContextLines$1 = 'Toggle Context Lines';
 const PreserveCase$1 = 'Preserve Case';
 const Refresh$2 = 'Refresh';
 const Replace = 'Replace';
@@ -2919,6 +2925,12 @@ const clearSearchResults = () => {
 const openNewSearchEditor = () => {
   return i18nString(OpenNewSearchEditor);
 };
+const contextLines = () => {
+  return i18nString(ContextLines$1);
+};
+const toggleContextLines$1 = () => {
+  return i18nString(ToggleContextLines$1);
+};
 const viewAsTree$1 = () => {
   return i18nString(ViewAsTree$1);
 };
@@ -3432,6 +3444,7 @@ const getMenuEntryIds = () => {
 
 const ClearAll$1 = 'ClearAll';
 const CollapseAll$1 = 'CollapseAll';
+const ContextLines = 'ContextLines';
 const FilesToExclude = 'FilesToExclude';
 const FilesToInclude = 'FilesToInclude';
 const MatchCase = 'MatchCase';
@@ -3443,6 +3456,7 @@ const ReplaceValue = 'ReplaceValue';
 const SearchOnlyOpenEditors = 'SearchOnlyOpenEditors';
 const SearchValue = 'SearchValue';
 const ToggleReplace = 'ToggleReplace';
+const ToggleContextLines = 'ToggleContextLines';
 const ToggleSearchDetails = 'ToggleSearchDetails';
 const UseExcludeSettings = 'UseExcludeSettings';
 const UseRegularExpression = 'UseRegularExpression';
@@ -3628,6 +3642,7 @@ const handleUpdateFull = async (state, update) => {
     root,
     scheme,
     threads,
+    useIgnoreFiles: hasUseIgnoreFiles(flags),
     usePullBasedSearch: shouldUsePullBasedSearch,
     useRegularExpression: Boolean(flags & UseRegularExpression$2)
   }, assetDir, platform, searchId, uid);
@@ -3769,6 +3784,7 @@ const handleUpdateIncremental = async (state, update) => {
     root,
     scheme,
     threads,
+    useIgnoreFiles: hasUseIgnoreFiles(flags),
     usePullBasedSearch: usePullBasedSearch,
     useRegularExpression: Boolean(flags & UseRegularExpression$2)
   }, assetDir, platform, searchId, uid);
@@ -3826,6 +3842,7 @@ const handleUpdatePullBased = async (state, update) => {
     root,
     scheme,
     threads,
+    useIgnoreFiles: hasUseIgnoreFiles(flags),
     usePullBasedSearch: shouldUsePullBasedSearch,
     useRegularExpression: Boolean(flags & UseRegularExpression$2)
   }, assetDir, platform, searchId, uid);
@@ -4020,6 +4037,44 @@ const getReplacingMessage = (fileCount, replaceCount) => {
   return replacingManyOccurrencesInManyFiles(replaceCount, fileCount);
 };
 
+const prompt = (text, options) => {
+  return invoke$1('ConfirmPrompt.prompt', text, options);
+};
+
+const getReplaceAllConfirmText = (matchCount, fileCount, replacement) => {
+  if (matchCount === 1) {
+    if (replacement) {
+      return confirmReplaceOneOccurrenceInOneFile(replacement);
+    }
+    return confirmReplaceOneOccurrenceInOneFileNoValue();
+  }
+  if (fileCount === 1) {
+    if (replacement) {
+      return confirmReplaceManyOccurrencesInOneFile(matchCount, replacement);
+    }
+    return confirmReplaceManyOccurrencesInOneFileNoValue(matchCount);
+  }
+  if (replacement) {
+    return confirmReplaceManyOccurrencesInManyFiles(matchCount, fileCount, replacement);
+  }
+  return confirmReplaceManyOccurrencesInManyFilesNoValue(matchCount, fileCount);
+};
+
+const replaceAllAndPrompt = async (workspacePath, items, replacement, matchCount, fileCount) => {
+  string(workspacePath);
+  array(items);
+  string(replacement);
+  number(matchCount);
+  number(fileCount);
+  const confirmTitle = replaceAll$1();
+  const confirmAccept = replace();
+  const confirmText = getReplaceAllConfirmText(matchCount, fileCount, replacement);
+  return prompt(confirmText, {
+    confirmMessage: confirmAccept,
+    title: confirmTitle
+  });
+};
+
 const getActualIndex = state => {
   const {
     focusedIndex,
@@ -4115,9 +4170,22 @@ const replaceAllInFocusedFile = async (state, fileIndex) => {
     scrollBarHeight
   };
 };
-const replaceAll = async state => {
-  const actualIndex = getActualIndex(state);
-  const fileIndex = getFileIndex$1(state, actualIndex);
+const confirmReplaceAll = async (state, fileIndex) => {
+  const {
+    items,
+    matchCount: totalMatchCount,
+    replacement,
+    workspacePath
+  } = state;
+  const targetItems = fileIndex === -1 ? items : getFileItems(state, fileIndex);
+  const fileCount = fileIndex === -1 ? targetItems.filter(item => item.type === File).length : 1;
+  const matchCount = fileIndex === -1 ? totalMatchCount : Math.max(targetItems.length - 1, 0);
+  if (matchCount === 0) {
+    return true;
+  }
+  return replaceAllAndPrompt(workspacePath, targetItems, replacement, matchCount, fileCount);
+};
+const replaceAllConfirmed = async (state, fileIndex) => {
   if (fileIndex !== -1) {
     return replaceAllInFocusedFile(state, fileIndex);
   }
@@ -4142,6 +4210,15 @@ const replaceAll = async state => {
     minLineY: 0
   };
 };
+const replaceAll = async state => {
+  const actualIndex = getActualIndex(state);
+  const fileIndex = getFileIndex$1(state, actualIndex);
+  const shouldReplace = await confirmReplaceAll(state, fileIndex);
+  if (!shouldReplace) {
+    return state;
+  }
+  return replaceAllConfirmed(state, fileIndex);
+};
 const replaceAllWithProgress = async context => {
   const state = context.getState();
   const {
@@ -4152,16 +4229,30 @@ const replaceAllWithProgress = async context => {
   const fileIndex = getFileIndex$1(state, actualIndex);
   const fileCount = fileIndex === -1 ? totalFileCount : 1;
   const matchCount = fileIndex === -1 ? totalMatchCount : Math.max(getFileItems(state, fileIndex).length - 1, 0);
+  const shouldReplace = await confirmReplaceAll(state, fileIndex);
+  if (!shouldReplace) {
+    return;
+  }
   const message = getReplacingMessage(fileCount, matchCount);
   await context.updateState(latestState => ({
     ...latestState,
     message
   }));
   await invoke$1('Search.rerender');
-  const updatedState = await replaceAll(context.getState());
+  const updatedState = await replaceAllConfirmed(context.getState(), fileIndex);
   await context.updateState(() => updatedState);
 };
 
+const toggleContextLines = async state => {
+  const {
+    contextLinesEnabled
+  } = state;
+  return {
+    ...state,
+    contextLinesEnabled: !contextLinesEnabled
+  };
+};
+
 const toggleDetailsExpanded = state => {
   const {
     flags
@@ -4258,6 +4349,8 @@ const getClickHandler = name => {
       return toggleOpenEditors;
     case SearchValue:
       return focusSearchValue$1;
+    case ToggleContextLines:
+      return toggleContextLines;
     case ToggleReplace:
       return toggleReplace;
     case ToggleSearchDetails:
@@ -4323,6 +4416,17 @@ const handleIncludeInput = (state, includeValue, inputSource = Script) => {
   });
 };
 
+const handleContextLinesInput = async (state, value) => {
+  const contextLines = Math.trunc(Number(value));
+  if (!Number.isFinite(contextLines)) {
+    return state;
+  }
+  return {
+    ...state,
+    contextLines: Math.max(0, contextLines)
+  };
+};
+
 const handleInput = (state, value, inputSource = Script) => {
   return handleUpdate(state, {
     inputSource,
@@ -4339,6 +4443,8 @@ const handleReplaceInput = (state, value, inputSource = Script) => {
 
 const getInputHandler = name => {
   switch (name) {
+    case ContextLines:
+      return handleContextLinesInput;
     case FilesToExclude:
       return handleExcludeInput;
     case FilesToInclude:
@@ -5321,6 +5427,7 @@ const restoreState = savedState => {
 
 const loadContent = async (state, savedState) => {
   const {
+    defaultExcludes: currentDefaultExcludes,
     limitHitWarning,
     width
   } = state;
@@ -5333,11 +5440,13 @@ const loadContent = async (state, savedState) => {
     savedValue,
     threads
   } = restoreState(savedState);
+  const defaultExcludes = await getSearchExcludes(currentDefaultExcludes);
   const usePullBasedSearch = await getUsePullBasedSearch();
   const warningHeight = await getSearchWarningMessageHeight(limitHitWarning, width);
   const headerHeight = getTopHeight(flags) + warningHeight;
   const update = {
     collapsedPaths: savedCollapsedPaths,
+    defaultExcludes,
     excludeValue,
     flags,
     focus: 0,
@@ -6005,6 +6114,26 @@ const getReplacePlaceholder = focus => {
   return replace();
 };
 
+const getSearchEditorContextLinesVirtualDom = (contextLines$1, contextLinesEnabled) => {
+  const button = {
+    flag: contextLinesEnabled ? CheckBoxEnabled : CheckBoxDisabled,
+    icon: 'MaskIconListSelection',
+    name: ToggleContextLines,
+    title: toggleContextLines$1()
+  };
+  return [{
+    ariaLabel: contextLines(),
+    childCount: 0,
+    className: `${InputBox} SearchEditorContextLinesInput`,
+    inputType: 'number',
+    min: 0,
+    name: ContextLines,
+    onInput: HandleInput2,
+    type: Input,
+    value: `${contextLines$1}`
+  }, ...getSearchFieldButtonVirtualDom(button)];
+};
+
 const getSearchPlaceholder = focus => {
   if (focus === FocusSearchInput) {
     return searchForHistory();
@@ -6030,7 +6159,7 @@ const getSearchToggleVirtualDom = replaceExpanded => {
   }];
 };
 
-const getSearchHeaderTopVirtualDom = (flags, searchInputErrorMessage, matchCount, focus) => {
+const getSearchHeaderTopVirtualDom = (flags, searchInputErrorMessage, matchCount, focus, isSearchEditor = false, contextLines = 1, contextLinesEnabled = false) => {
   const inputActions = getInputActionsInput(flags);
   const replaceActions = getInputActionsReplace(flags, matchCount);
   const searchPlaceholder = getSearchPlaceholder(focus);
@@ -6046,14 +6175,25 @@ const getSearchHeaderTopVirtualDom = (flags, searchInputErrorMessage, matchCount
     className: SearchHeaderTopRight,
     role: None$2,
     type: Div
-  }, ...getSearchFieldVirtualDom(SearchValue, searchPlaceholder, HandleInput2, inputActions.inside, inputActions.outside, Boolean(searchInputErrorMessage))];
+  }];
+  const searchFieldDom = getSearchFieldVirtualDom(SearchValue, searchPlaceholder, HandleInput2, inputActions.inside, inputActions.outside, Boolean(searchInputErrorMessage));
+  if (isSearchEditor) {
+    dom.push({
+      childCount: 3,
+      className: SearchFieldContainer,
+      role: None$2,
+      type: Div
+    }, ...searchFieldDom, ...getSearchEditorContextLinesVirtualDom(contextLines, contextLinesEnabled));
+  } else {
+    dom.push(...searchFieldDom);
+  }
   if (flags & ReplaceExpanded) {
     dom.push(...getSearchFieldVirtualDom(ReplaceValue, replacePlaceholder, HandleInput2, replaceActions.inside, replaceActions.outside));
   }
   return dom;
 };
 
-const getSearchHeaderVirtualDom = (flags, message, searchInputErrorMessage, matchCount, focus, limitHitWarning) => {
+const getSearchHeaderVirtualDom = (flags, message, searchInputErrorMessage, matchCount, focus, limitHitWarning, isSearchEditor = false, contextLines = 1, contextLinesEnabled = false) => {
   const warningDom = getSearchHeaderLimitHitVirtualDom(limitHitWarning);
   const parentNode = {
     childCount: 2 + (warningDom.length > 0 ? 1 : 0),
@@ -6062,7 +6202,7 @@ const getSearchHeaderVirtualDom = (flags, message, searchInputErrorMessage, matc
     role: None$2,
     type: Div
   };
-  const dom = [parentNode, ...getSearchHeaderTopVirtualDom(flags, searchInputErrorMessage, matchCount, focus), ...getSearchHeaderDetailsVirtualDom(flags, message), ...warningDom];
+  const dom = [parentNode, ...getSearchHeaderTopVirtualDom(flags, searchInputErrorMessage, matchCount, focus, isSearchEditor, contextLines, contextLinesEnabled), ...getSearchHeaderDetailsVirtualDom(flags, message), ...warningDom];
   return dom;
 };
 
@@ -6312,7 +6452,7 @@ const getSearchResultsVirtualDom = (visibleItems, focusOutline, scrollbarHeight,
 };
 
 const className = mergeClassNames(Viewlet, Search$3);
-const getSearchVirtualDom = (visibleItems, flags, message, focusOutline, searchInputErrorMessage, scrollBarHeight, scrollBarY, scrollBarValue, deltaY, itemHeight, matchCount, limitHitWarning, focus = 0, initial = false) => {
+const getSearchVirtualDom = (visibleItems, flags, message, focusOutline, searchInputErrorMessage, scrollBarHeight, scrollBarY, scrollBarValue, deltaY, itemHeight, matchCount, limitHitWarning, focus = 0, initial = false, isSearchEditor = false, contextLines = 1, contextLinesEnabled = false) => {
   if (initial) {
     return [];
   }
@@ -6322,12 +6462,12 @@ const getSearchVirtualDom = (visibleItems, flags, message, focusOutline, searchI
     childCount,
     className,
     type: Div
-  }, ...getSearchHeaderVirtualDom(flags, message, searchInputErrorMessage, matchCount, focus, limitHitWarning), ...errorDom, ...getSearchResultsVirtualDom(visibleItems, focusOutline, scrollBarHeight, scrollBarY, scrollBarValue, deltaY, itemHeight)];
+  }, ...getSearchHeaderVirtualDom(flags, message, searchInputErrorMessage, matchCount, focus, limitHitWarning, isSearchEditor, contextLines, contextLinesEnabled), ...errorDom, ...getSearchResultsVirtualDom(visibleItems, focusOutline, scrollBarHeight, scrollBarY, scrollBarValue, deltaY, itemHeight)];
 };
 
 const getDom = 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, newState.limitHitWarning, viewModel.focus, newState.initial);
+  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, newState.initial, newState.isSearchEditor, newState.contextLines, newState.contextLinesEnabled);
   return dom;
 };
 
@@ -6583,45 +6723,6 @@ const renderEventListeners = () => {
   }];
 };
 
-const prompt = (text, options) => {
-  return invoke$1('ConfirmPrompt.prompt', text, options);
-};
-
-const getReplaceAllConfirmText = (matchCount, fileCount, replacement) => {
-  if (matchCount === 1) {
-    if (replacement) {
-      return confirmReplaceOneOccurrenceInOneFile(replacement);
-    }
-    return confirmReplaceOneOccurrenceInOneFileNoValue();
-  }
-  if (fileCount === 1) {
-    if (replacement) {
-      return confirmReplaceManyOccurrencesInOneFile(matchCount, replacement);
-    }
-    return confirmReplaceManyOccurrencesInOneFileNoValue(matchCount);
-  }
-  if (replacement) {
-    return confirmReplaceManyOccurrencesInManyFiles(matchCount, fileCount, replacement);
-  }
-  return confirmReplaceManyOccurrencesInManyFilesNoValue(matchCount, fileCount);
-};
-
-const replaceAllAndPrompt = async (workspacePath, items, replacement, matchCount, fileCount) => {
-  string(workspacePath);
-  array(items);
-  string(replacement);
-  number(matchCount);
-  number(fileCount);
-  const confirmTitle = replaceAll$1();
-  const confirmAccept = replace();
-  const confirmText = getReplaceAllConfirmText(matchCount, fileCount, replacement);
-  const shouldReplace = await prompt(confirmText, {
-    confirmMessage: confirmAccept,
-    title: confirmTitle
-  });
-  return shouldReplace;
-};
-
 const replaceAllInFile = async state => {
   // TODO replace occurrance  for focused file
   return {

package/package.json

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