@lvce-editor/editor-worker 19.77.8 → 19.77.10

package/dist/diff-sdk.js

@@ -2240,7 +2240,11 @@ const getCharacterWidth = (line, start, end, tabSize) => {
   // Treat each cluster as one display column; the extra cluster below is a safe overscan.
   return 1;
 };
-const getHorizontalDisplayColumn = (line, sourceColumn, tabSize, segments = getSegments(line)) => {
+const getHorizontalDisplayColumn = (line, sourceColumn, tabSize, suppliedSegments) => {
+  if (sourceColumn <= 0) {
+    return 0;
+  }
+  const segments = suppliedSegments ?? getSegments(line);
   let displayColumn = 0;
   for (let i = 0; i < segments.length - 1; i++) {
     const start = segments[i];
@@ -2252,13 +2256,14 @@ const getHorizontalDisplayColumn = (line, sourceColumn, tabSize, segments = getS
   }
   return displayColumn;
 };
-const getHorizontalVisibleRange = (line, deltaX, width, averageCharWidth, tabSize, threshold = defaultThreshold, segments = getSegments(line)) => {
+const getHorizontalVisibleRange = (line, deltaX, width, averageCharWidth, tabSize, threshold = defaultThreshold, suppliedSegments) => {
   if (line.length <= threshold) {
     return {
       end: line.length,
       start: 0
     };
   }
+  const segments = suppliedSegments ?? getSegments(line);
   const charWidth = averageCharWidth > 0 ? averageCharWidth : 1;
   const scrollOffset = Math.max(0, Number.isFinite(deltaX) ? deltaX : 0);
   const viewportWidth = Number.isFinite(width) ? Math.max(0, width) : Infinity;
@@ -6271,7 +6276,7 @@ const updateLines = (editor, lines) => {
  * @param {Uint32Array|undefined} selectionChanges
  * @returns
  */
-const scheduleDocumentAndCursorsSelections = async (editor, changes, selectionChanges = undefined) => {
+const scheduleDocumentAndCursorsSelections = async (editor, changes, selectionChanges = undefined, options = {}) => {
   object(editor);
   array(changes);
   if (changes.length === 0) {
@@ -6327,7 +6332,7 @@ const scheduleDocumentAndCursorsSelections = async (editor, changes, selectionCh
   set$b(editor.uid, editor, newEditorWithDecorations);
 
   // Notify main-area-worker about modified status change
-  if (!editor.modified) {
+  if (!editor.modified && options.notifyModifiedStatusChange !== false) {
     await notifyTabModifiedStatusChange(editor.uri, true, editor.applicationId);
   }
 
@@ -9333,7 +9338,7 @@ const error = (...args) => {
   console.error(...args);
 };
 
-const applyDocumentEdits$1 = (editor, edits) => {
+const applyDocumentEdits$1 = (editor, edits, options = {}) => {
   if (!Array.isArray(edits)) {
     warn('something is wrong with format on save', edits);
     return editor;
@@ -9346,7 +9351,7 @@ const applyDocumentEdits$1 = (editor, edits) => {
     ...editor
   }, documentEdits);
   const selections = getFormattingSelections(editor.lines, newLines, editor.selections);
-  return scheduleDocumentAndCursorsSelections(editor, documentEdits, selections);
+  return scheduleDocumentAndCursorsSelections(editor, documentEdits, selections, options);
 };
 
 const applyEdit = async (editor, changes, selectionChanges) => {
@@ -9879,11 +9884,17 @@ const formatAfterSave = async (uid, snapshot) => {
     if (staleReason) {
       return editor;
     }
-    const formattedEditor = await applyDocumentEdits$1(editor, edits);
+    const formattedEditor = await applyDocumentEdits$1(editor, edits, {
+      notifyModifiedStatusChange: false
+    });
     if (formattedEditor === editor || getText$1(formattedEditor) === originalText) {
       return editor;
     }
-    return save$1(formattedEditor, true);
+    const savedEditor = await save$1(formattedEditor, true);
+    if (savedEditor === formattedEditor) {
+      await notifyTabModifiedStatusChange(editor.uri, true, editor.applicationId);
+    }
+    return savedEditor;
   });
   await applyFormatting(uid);
 };

package/dist/editorWorkerMain.js

@@ -3606,7 +3606,11 @@ const getCharacterWidth = (line, start, end, tabSize) => {
   // Treat each cluster as one display column; the extra cluster below is a safe overscan.
   return 1;
 };
-const getHorizontalDisplayColumn = (line, sourceColumn, tabSize, segments = getSegments(line)) => {
+const getHorizontalDisplayColumn = (line, sourceColumn, tabSize, suppliedSegments) => {
+  if (sourceColumn <= 0) {
+    return 0;
+  }
+  const segments = suppliedSegments ?? getSegments(line);
   let displayColumn = 0;
   for (let i = 0; i < segments.length - 1; i++) {
     const start = segments[i];
@@ -3618,13 +3622,14 @@ const getHorizontalDisplayColumn = (line, sourceColumn, tabSize, segments = getS
   }
   return displayColumn;
 };
-const getHorizontalVisibleRange = (line, deltaX, width, averageCharWidth, tabSize, threshold = defaultThreshold, segments = getSegments(line)) => {
+const getHorizontalVisibleRange = (line, deltaX, width, averageCharWidth, tabSize, threshold = defaultThreshold, suppliedSegments) => {
   if (line.length <= threshold) {
     return {
       end: line.length,
       start: 0
     };
   }
+  const segments = suppliedSegments ?? getSegments(line);
   const charWidth = averageCharWidth > 0 ? averageCharWidth : 1;
   const scrollOffset = Math.max(0, Number.isFinite(deltaX) ? deltaX : 0);
   const viewportWidth = Number.isFinite(width) ? Math.max(0, width) : Infinity;
@@ -6696,7 +6701,7 @@ const updateLines = (editor, lines) => {
  * @param {Uint32Array|undefined} selectionChanges
  * @returns
  */
-const scheduleDocumentAndCursorsSelections = async (editor, changes, selectionChanges = undefined) => {
+const scheduleDocumentAndCursorsSelections = async (editor, changes, selectionChanges = undefined, options = {}) => {
   object(editor);
   array(changes);
   if (changes.length === 0) {
@@ -6752,7 +6757,7 @@ const scheduleDocumentAndCursorsSelections = async (editor, changes, selectionCh
   set$b(editor.uid, editor, newEditorWithDecorations);
 
   // Notify main-area-worker about modified status change
-  if (!editor.modified) {
+  if (!editor.modified && options.notifyModifiedStatusChange !== false) {
     await notifyTabModifiedStatusChange(editor.uri, true, editor.applicationId);
   }
 
@@ -9758,7 +9763,7 @@ const error = (...args) => {
   console.error(...args);
 };
 
-const applyDocumentEdits$1 = (editor, edits) => {
+const applyDocumentEdits$1 = (editor, edits, options = {}) => {
   if (!Array.isArray(edits)) {
     warn('something is wrong with format on save', edits);
     return editor;
@@ -9771,7 +9776,7 @@ const applyDocumentEdits$1 = (editor, edits) => {
     ...editor
   }, documentEdits);
   const selections = getFormattingSelections(editor.lines, newLines, editor.selections);
-  return scheduleDocumentAndCursorsSelections(editor, documentEdits, selections);
+  return scheduleDocumentAndCursorsSelections(editor, documentEdits, selections, options);
 };
 
 const applyEdit = async (editor, changes, selectionChanges) => {
@@ -10299,11 +10304,17 @@ const formatAfterSave = async (uid, snapshot) => {
     if (staleReason) {
       return editor;
     }
-    const formattedEditor = await applyDocumentEdits$1(editor, edits);
+    const formattedEditor = await applyDocumentEdits$1(editor, edits, {
+      notifyModifiedStatusChange: false
+    });
     if (formattedEditor === editor || getText$1(formattedEditor) === originalText) {
       return editor;
     }
-    return save$1(formattedEditor, true);
+    const savedEditor = await save$1(formattedEditor, true);
+    if (savedEditor === formattedEditor) {
+      await notifyTabModifiedStatusChange(editor.uri, true, editor.applicationId);
+    }
+    return savedEditor;
   });
   await applyFormatting(uid);
 };

package/package.json

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