@lvce-editor/editor-worker 19.71.4 → 19.71.6

package/dist/editorWorkerMain.js

@@ -7709,7 +7709,10 @@ const wrapCommand$1 = (fn, preservesTypingCoalescing = false, returnState = true
       return returnState ? newEditor : undefined;
     }
     const newEditorWithDerivedState = await updateDerivedState(state, newEditor);
-    set$a(uid, state, newEditorWithDerivedState);
+    // Another command can commit before the renderer consumes this edit.
+    // Keep its last rendered baseline, including renders completed while we awaited derived state.
+    const renderedState = get$8(uid)?.oldState ?? oldInstance.oldState;
+    set$a(uid, renderedState, newEditorWithDerivedState);
     await dispose$3();
     if (editorDiagnosticEffect.isActive(state, newEditorWithDerivedState)) {
       void editorDiagnosticEffect.apply(newEditorWithDerivedState);
@@ -12868,6 +12871,16 @@ const selectionShrink = editor => {
 
 // TODO handle virtual space
 
+const getOccurrenceIndex = (line, word, startIndex, caseInsensitive) => {
+  if (!caseInsensitive) {
+    return line.indexOf(word, startIndex);
+  }
+  const escapedWord = word.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+  const expression = new RegExp(escapedWord, 'giu');
+  expression.lastIndex = startIndex;
+  return expression.exec(line)?.index ?? -1;
+};
+
 // TODO editors behave differently when selecting next occurrence, for example:
 
 // aaa
@@ -12886,12 +12899,17 @@ const selectionShrink = editor => {
 // - brackets (codemirror) selects position 3 and then selects position 1
 // - sublime selects next position 1, then next position 3
 
-const getSelectionEditsSingleLineWord = (lines, selections) => {
+const getSelectionEditsSingleLineWord = editor => {
+  const {
+    lines,
+    selections
+  } = editor;
   const lastSelectionIndex = selections.length - 4;
   const [rowIndex, lastSelectionStartColumnIndex,, lastSelectionEndColumnIndex] = getSelectionPairs(selections, lastSelectionIndex);
   const line = lines[rowIndex];
   const word = line.slice(lastSelectionStartColumnIndex, lastSelectionEndColumnIndex);
-  const columnIndexAfter = line.indexOf(word, lastSelectionEndColumnIndex);
+  const caseInsensitive = editor.selectedTextOccurrenceMatching === 'caseInsensitive';
+  const columnIndexAfter = getOccurrenceIndex(line, word, lastSelectionEndColumnIndex, caseInsensitive);
   if (columnIndexAfter !== -1) {
     const columnIndexAfterEnd = columnIndexAfter + word.length;
     const newSelections = new Uint32Array(selections.length + 4);
@@ -12908,7 +12926,7 @@ const getSelectionEditsSingleLineWord = (lines, selections) => {
   }
   for (let i = rowIndex + 1; i < lines.length; i++) {
     const line = lines[i];
-    const columnIndex = line.indexOf(word);
+    const columnIndex = getOccurrenceIndex(line, word, 0, caseInsensitive);
     if (columnIndex !== -1) {
       const columnIndexEnd = columnIndex + word.length;
       const newSelections = new Uint32Array(selections.length + 4);
@@ -12929,7 +12947,7 @@ const getSelectionEditsSingleLineWord = (lines, selections) => {
   for (let i = 0; i <= rowIndex; i++) {
     const line = lines[i];
     let columnIndex = -word.length;
-    while ((columnIndex = line.indexOf(word, columnIndex + word.length)) !== -1) {
+    while ((columnIndex = getOccurrenceIndex(line, word, columnIndex + word.length, caseInsensitive)) !== -1) {
       let startRowIndex = selections[selectionIndex];
       while (startRowIndex < i && selectionIndex < selections.length) {
         selectionIndex += 4;
@@ -12998,7 +13016,7 @@ const getSelectNextOccurrenceResult = editor => {
     };
   }
   if (isEverySelectionSingleLine(editor.selections)) {
-    return getSelectionEditsSingleLineWord(editor.lines, editor.selections);
+    return getSelectionEditsSingleLineWord(editor);
   }
   return undefined;
 };
@@ -16012,6 +16030,10 @@ const getMergeConflictActionsEnabled = async () => {
 const DEFAULT_HOVER_DELAY = 200;
 const DEFAULT_MESSAGE_DELAY = 3000;
 const MAX_MESSAGE_DELAY = 10_000;
+const DEFAULT_SELECTED_TEXT_OCCURRENCE_MATCHING = 'caseSensitive';
+const getSelectedTextOccurrenceMatching = value => {
+  return value === 'caseInsensitive' ? value : DEFAULT_SELECTED_TEXT_OCCURRENCE_MATCHING;
+};
 const getHoverDelay = value => {
   const delay = typeof value === 'number' ? value : Number(value);
   if (!Number.isFinite(delay) || delay < 0) {
@@ -16027,7 +16049,7 @@ const getMessageDelay = value => {
   return delay;
 };
 const getEditorPreferences = async () => {
-  const [diagnosticsEnabled, fontFamily, fontSize, fontWeight, formatOnSave, hoverEnabled, hoverDelay, messageDelay, isAutoClosingBracketsEnabled$1, isAutoClosingQuotesEnabled$1, isAutoClosingTagsEnabled$1, isQuickSuggestionsEnabled$1, lineNumbers, highlightActiveLineNumber, rowHeight, tabSize, letterSpacing, completionTriggerCharacters, minimapEnabled, mergeConflictActionsEnabled, breadcrumbsEnabled, insertSpaces, dragAndDropEnabled, roundedSelection, combineWhitespaceTokens] = await Promise.all([get$3('editor.diagnostics'), getFontFamily(), getFontSize(), getFontWeight(), get$3('editor.formatOnSave'), get$3('editor.hover'), get$3('editor.hoverDelay'), get$3('editor.messageDelay'), isAutoClosingBracketsEnabled(), isAutoClosingQuotesEnabled(), isAutoClosingTagsEnabled(), isQuickSuggestionsEnabled(), getLineNumbers(), getHighlightActiveLineNumber(), getRowHeight(), getTabSize(), getLetterSpacing(), getCompletionTriggerCharacters(), getMinimapEnabled(), getMergeConflictActionsEnabled(), get$3('breadcrumbs.enabled'), get$3('editor.insertSpaces'), get$3('editor.dragAndDrop'), get$3('editor.roundedSelection'), get$3('editor.combineWhitespaceTokens')]);
+  const [diagnosticsEnabled, fontFamily, fontSize, fontWeight, formatOnSave, hoverEnabled, hoverDelay, messageDelay, isAutoClosingBracketsEnabled$1, isAutoClosingQuotesEnabled$1, isAutoClosingTagsEnabled$1, isQuickSuggestionsEnabled$1, lineNumbers, highlightActiveLineNumber, rowHeight, tabSize, letterSpacing, completionTriggerCharacters, minimapEnabled, mergeConflictActionsEnabled, breadcrumbsEnabled, insertSpaces, dragAndDropEnabled, roundedSelection, combineWhitespaceTokens, selectedTextOccurrenceMatching] = await Promise.all([get$3('editor.diagnostics'), getFontFamily(), getFontSize(), getFontWeight(), get$3('editor.formatOnSave'), get$3('editor.hover'), get$3('editor.hoverDelay'), get$3('editor.messageDelay'), isAutoClosingBracketsEnabled(), isAutoClosingQuotesEnabled(), isAutoClosingTagsEnabled(), isQuickSuggestionsEnabled(), getLineNumbers(), getHighlightActiveLineNumber(), getRowHeight(), getTabSize(), getLetterSpacing(), getCompletionTriggerCharacters(), getMinimapEnabled(), getMergeConflictActionsEnabled(), get$3('breadcrumbs.enabled'), get$3('editor.insertSpaces'), get$3('editor.dragAndDrop'), get$3('editor.roundedSelection'), get$3('editor.combineWhitespaceTokens'), get$3('editor.selectedTextOccurrenceMatching')]);
   return {
     breadcrumbsEnabled: breadcrumbsEnabled ?? false,
     combineWhitespaceTokens: combineWhitespaceTokens ?? true,
@@ -16053,6 +16075,7 @@ const getEditorPreferences = async () => {
     minimapEnabled,
     roundedSelection: roundedSelection === true,
     rowHeight,
+    selectedTextOccurrenceMatching: getSelectedTextOccurrenceMatching(selectedTextOccurrenceMatching),
     tabSize
   };
 };
@@ -16459,6 +16482,7 @@ const loadContent = async (state, savedState, largeFile = false, focus = true, f
     minimapEnabled,
     roundedSelection,
     rowHeight,
+    selectedTextOccurrenceMatching,
     tabSize
   } = await getEditorPreferences();
   // TODO support overwriting language id by setting it explicitly or via settings
@@ -16498,6 +16522,7 @@ const loadContent = async (state, savedState, largeFile = false, focus = true, f
     minimapEnabled,
     roundedSelection,
     rowHeight,
+    selectedTextOccurrenceMatching,
     tabSize,
     tokenizerId: state.tokenizerId
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "19.71.4",
+  "version": "19.71.6",
   "repository": {
     "type": "git",
     "url": "git@github.com:lvce-editor/editor-worker.git"