@lvce-editor/find-widget-worker 3.1.0 → 3.2.0

package/dist/findWidgetWorkerMain.js

@@ -1181,16 +1181,16 @@ const focusIndex = async (state, index) => {
   const {
     editorUid,
     matches,
-    matchIndex,
-    value
+    matchIndex
   } = state;
   if (index === matchIndex) {
     return state;
   }
   // // TODO find next match and highlight it
-  const matchRowIndex = matches[index * 2];
-  const matchColumnIndex = matches[index * 2 + 1];
-  const newSelections = new Uint32Array([matchRowIndex, matchColumnIndex, matchRowIndex, matchColumnIndex + value.length]);
+  const matchRowIndex = matches[index * 3];
+  const matchColumnIndex = matches[index * 3 + 1];
+  const matchLength = matches[index * 3 + 2];
+  const newSelections = new Uint32Array([matchRowIndex, matchColumnIndex, matchRowIndex, matchColumnIndex + matchLength]);
   await setSelections(editorUid, newSelections);
   return {
     ...state,
@@ -1287,7 +1287,7 @@ const findRegexMatches = (lines, regex) => {
       if (!lastMatch) {
         break;
       }
-      matches.push(i, lastMatch.index);
+      matches.push(i, lastMatch.index, lastMatch[0].length);
     } while (true);
   }
   return new Uint32Array(matches);
@@ -1318,7 +1318,7 @@ const findMatches = (lines, searchString, options) => {
 };
 
 const getMatchCount = matches => {
-  return matches.length / 2;
+  return matches.length / 3;
 };
 
 const measureTextHeight = (value, lineHeight) => {
@@ -1459,6 +1459,47 @@ const applyEdits = async (editorId, edits) => {
   await invoke('Editor.applyDocumentEdits', editorId, edits);
 };
 
+/**
+ * Apply regex replacement with back-reference substitution ($1, $2, etc.)
+ */
+const applyRegexReplacement = (originalText, regex, replacement) => {
+  // Create a non-global version of the regex to get capture groups
+  const flags = regex.flags.replace('g', '');
+  const nonGlobalRegex = new RegExp(regex.source, flags);
+  const match = nonGlobalRegex.exec(originalText);
+  if (!match) {
+    return replacement;
+  }
+
+  // Replace $n back-references with captured groups
+  let result = replacement;
+
+  // Handle $& (entire match)
+  result = result.replaceAll('$&', match[0]);
+
+  // Handle $` (text before match) - in this context it's empty since we're matching the whole text
+  result = result.replaceAll('$`', '');
+
+  // Handle $' (text after match) - in this context it's empty since we're matching the whole text
+  result = result.replaceAll("$'", '');
+
+  // Handle $$ (literal $)
+  result = result.replaceAll('$$', '\u0000DOLLAR\u0000');
+
+  // Handle $n and $nn (numbered capture groups)
+  result = result.replaceAll(/\$(\d{1,2})/g, (_match, groupNumber) => {
+    const index = Number.parseInt(groupNumber, 10);
+    if (index < match.length) {
+      return match[index] ?? '';
+    }
+    return `$${groupNumber}`;
+  });
+
+  // Restore literal $
+  result = result.replaceAll('\u0000DOLLAR\u0000', '$');
+  return result;
+};
+
 /**
  * Preserves the case pattern of the original text when replacing.
  * Supports uppercase, lowercase, PascalCase, and camelCase patterns.
@@ -1498,24 +1539,47 @@ const preserveCase$1 = (originalText, replacementText) => {
   return replacementText;
 };
 
-const getEdits = (matches, value, replacement, startIndex, replaceAll, lines, preserveCaseOption = false) => {
+const getEdits = (matches, value, replacement, startIndex, replaceAll, lines, preserveCaseOption = false, options) => {
   if (value.length === 0 || matches.length === 0) {
     return [];
   }
   const edits = [];
-  const totalMatches = Math.floor(matches.length / 2);
+  const totalMatches = Math.floor(matches.length / 3);
   const fromIndex = replaceAll ? 0 : Math.max(0, startIndex);
   const toIndex = replaceAll ? totalMatches : Math.min(totalMatches, fromIndex + 1);
+
+  // Build regex once if using regular expressions
+  let regex;
+  if (options?.useRegularExpression) {
+    const {
+      error,
+      regex: builtRegex
+    } = buildRegex(value, options);
+    if (!error) {
+      regex = builtRegex;
+    }
+  }
   for (let i = fromIndex; i < toIndex; i++) {
-    const rowIndex = matches[i * 2];
-    const startColumnIndex = matches[i * 2 + 1];
-    const endColumnIndex = startColumnIndex + value.length;
+    const rowIndex = matches[i * 3];
+    const startColumnIndex = matches[i * 3 + 1];
+    const matchLength = matches[i * 3 + 2];
+    const endColumnIndex = startColumnIndex + matchLength;
 
     // Get the original text that was matched
     const originalText = lines[rowIndex].slice(startColumnIndex, endColumnIndex);
 
+    // Apply regex replacement with back-references if enabled
+    let finalReplacement;
+    if (options?.useRegularExpression && regex) {
+      finalReplacement = applyRegexReplacement(originalText, regex, replacement);
+    } else {
+      finalReplacement = replacement;
+    }
+
     // Apply case preservation if enabled
-    const finalReplacement = preserveCaseOption ? preserveCase$1(originalText, replacement) : replacement;
+    if (preserveCaseOption) {
+      finalReplacement = preserveCase$1(originalText, finalReplacement);
+    }
 
     // Convert row/column positions to character offsets
     let startOffset = 0;
@@ -1542,16 +1606,22 @@ const replace$1 = async state => {
   const {
     editorUid,
     lines,
+    matchCase,
     matches,
     matchIndex,
+    matchWholeWord,
     preserveCase,
     replacement,
+    useRegularExpression,
     value
   } = state;
-  const edits = getEdits(matches, value, replacement, matchIndex, false, lines, preserveCase);
+  const options = {
+    matchCase,
+    matchWholeWord,
+    useRegularExpression
+  };
+  const edits = getEdits(matches, value, replacement, matchIndex, false, lines, preserveCase, options);
   await applyEdits(editorUid, edits);
-  // TODO ask editor worker to apply edit
-  // TODO ask editor worker for new lines?
   return {
     ...state
   };
@@ -1561,12 +1631,20 @@ const replaceAll$1 = state => {
   const {
     editorUid,
     lines,
+    matchCase,
     matches,
+    matchWholeWord,
     preserveCase,
     replacement,
+    useRegularExpression,
     value
   } = state;
-  const edits = getEdits(matches, value, replacement, 0, true, lines, preserveCase);
+  const options = {
+    matchCase,
+    matchWholeWord,
+    useRegularExpression
+  };
+  const edits = getEdits(matches, value, replacement, 0, true, lines, preserveCase, options);
   void applyEdits(editorUid, edits);
   return {
     ...state
@@ -1605,7 +1683,7 @@ const handleFindWidgetFocus = (state, focusKey) => {
   const {
     focus
   } = state;
-  if (focus === focusKey) {
+  if (!focusKey || focus === focusKey) {
     return state;
   }
   return {
@@ -1619,6 +1697,7 @@ const handleFindFocus = state => {
   return handleFindWidgetFocus(state, FindWidget$1);
 };
 
+// TODO maybe use one handleFocus function with a name parameter
 const handleReplaceFocus = state => {
   return handleFindWidgetFocus(state, FocusFindWidgetReplace);
 };
@@ -1822,6 +1901,10 @@ const getKeyBindings = () => {
     command: 'FindWidget.focusPreviousMatchButton',
     key: Tab,
     when: FocusFindWidgetReplace$1
+  }, {
+    command: 'FindWidget.replace',
+    key: Enter,
+    when: FocusFindWidgetReplace$1
   }, {
     command: 'FindWidget.replaceAll',
     key: Alt | CtrlCmd | Enter,
@@ -1916,6 +1999,9 @@ const getLines = async editorUid => {
 };
 
 const getSelectedText = (lines, selections) => {
+  if (selections.length === 0) {
+    return '';
+  }
   const startRowIndex = selections[0];
   const startColumnIndex = selections[1];
   const endColumnIndex = selections[3];
@@ -2514,7 +2600,7 @@ const getEventListeners = (uid, widgetId) => {
     params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleBlur', 0, widgetId]
   }, {
     name: HandleReplaceInput,
-    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleReplaceInput', 0, widgetId]
+    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleReplaceInput', 0, widgetId, TargetValue]
   }, {
     name: HandleReplaceFocus,
     params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleReplaceFocus', 0, widgetId]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/find-widget-worker",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Web Worker for the find widget in Lvce Editor",
   "repository": {
     "type": "git",