@lvce-editor/editor-worker 19.20.0 → 19.21.0

package/dist/editorWorkerMain.js

@@ -4158,6 +4158,10 @@ const getLanguageByFileName = (languages, fileNameLower) => {
   }
   return '';
 };
+const getFileName = uri => {
+  const slashIndex = Math.max(uri.lastIndexOf('/'), uri.lastIndexOf('\\'));
+  return uri.slice(slashIndex + 1);
+};
 const getLanguageId$1 = (uri, languages) => {
   string(uri);
   // TODO this is inefficient for icon theme, as file extension is computed twice
@@ -4170,7 +4174,7 @@ const getLanguageId$1 = (uri, languages) => {
   if (candidate1) {
     return candidate1;
   }
-  const fileNameLower = uri.toLowerCase();
+  const fileNameLower = getFileName(uri).toLowerCase();
   const secondExtensionIndex = getNthFileExtension(uri, extensionIndex - 1);
   const secondExtension = uri.slice(secondExtensionIndex);
   const candidate2 = getLanguageByExtension(languages, secondExtension);
@@ -5235,20 +5239,28 @@ const handleBlur$1 = async editor => {
 
 const replaceRange = (editor, ranges, replacement, origin) => {
   const changes = [];
+  const columnDeltas = new Map();
   const rangesLength = ranges.length;
   for (let i = 0; i < rangesLength; i += 4) {
     const [selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn] = getSelectionPairs(ranges, i);
+    const columnDelta = selectionStartRow === selectionEndRow ? columnDeltas.get(selectionStartRow) ?? 0 : 0;
     const start = {
-      columnIndex: selectionStartColumn,
+      columnIndex: selectionStartColumn + columnDelta,
       rowIndex: selectionStartRow
     };
     const end = {
-      columnIndex: selectionEndColumn,
+      columnIndex: selectionEndColumn + columnDelta,
       rowIndex: selectionEndRow
     };
     const selection = {
-      end,
-      start
+      end: {
+        columnIndex: selectionEndColumn,
+        rowIndex: selectionEndRow
+      },
+      start: {
+        columnIndex: selectionStartColumn,
+        rowIndex: selectionStartRow
+      }
     };
     changes.push({
       deleted: getSelectionText(editor, selection),
@@ -5257,6 +5269,14 @@ const replaceRange = (editor, ranges, replacement, origin) => {
       origin,
       start: start
     });
+    if (selectionStartRow === selectionEndRow) {
+      if (replacement.length <= 1) {
+        const insertedLength = replacement[0]?.length ?? 0;
+        columnDeltas.set(selectionStartRow, columnDelta + insertedLength - (selectionEndColumn - selectionStartColumn));
+      } else {
+        columnDeltas.set(selectionStartRow, replacement.at(-1).length - selectionEndColumn);
+      }
+    }
   }
   return changes;
 };
@@ -7573,6 +7593,15 @@ const handleTouchMove = (editor, touchEvent) => {
   setDeltaYFixedValue(editor, offsetY);
 };
 
+const handleUriChange = async (editor, newUri) => {
+  const content = getText$1(editor);
+  await invoke$6(TextDocumentSyncFull, newUri, editor.id, editor.languageId, content);
+  return {
+    ...editor,
+    uri: newUri
+  };
+};
+
 // Keep wheel handling as a dedicated command entry point and delegate
 // the actual scroll state update to the shared setDelta logic.
 // @ts-ignore
@@ -8387,9 +8416,7 @@ const selectionGrow = async editor => {
 
 const getSelectionEditsSingleLineWord = (lines, selections) => {
   const lastSelectionIndex = selections.length - 4;
-  const rowIndex = selections[lastSelectionIndex];
-  const lastSelectionStartColumnIndex = selections[lastSelectionIndex + 1];
-  const lastSelectionEndColumnIndex = selections[lastSelectionIndex + 3];
+  const [rowIndex, lastSelectionStartColumnIndex,, lastSelectionEndColumnIndex] = getSelectionPairs(selections, lastSelectionIndex);
   const line = lines[rowIndex];
   const word = line.slice(lastSelectionStartColumnIndex, lastSelectionEndColumnIndex);
   const columnIndexAfter = line.indexOf(word, lastSelectionEndColumnIndex);
@@ -12811,6 +12838,7 @@ const commandMap = {
   'Editor.handleTouchMove': wrapCommand(handleTouchMove),
   'Editor.handleTouchStart': wrapCommand(handleTouchStart),
   'Editor.handleTripleClick': wrapCommand(handleTripleClick),
+  'Editor.handleUriChange': wrapCommand(handleUriChange),
   'Editor.handleWheel': wrapCommand(handleWheel$2),
   'Editor.hotReload': hotReload,
   'Editor.indendLess': wrapCommand(indentLess),

package/package.json

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