@lvce-editor/editor-worker 19.78.10 → 19.78.12

package/dist/diff-sdk.js

@@ -19592,8 +19592,8 @@ const handleContextMenu = async (editor, button, x, y) => {
 /* eslint-disable sonarjs/super-linear-regex */
 
 // match all words, including umlauts, see https://stackoverflow.com/questions/5436824/matching-accented-characters-with-javascript-regexes/#answer-11550799
-const RE_WORD_START = /^[a-zA-Z\u{C0}-\u{17F}\d]+/u;
-const RE_WORD_END = /[a-zA-Z\u{C0}-\u{17F}\d]+$/u;
+const RE_WORD_START = /^[a-zA-Z\u{C0}-\u{17F}\d_]+/u;
+const RE_WORD_END = /[a-zA-Z\u{C0}-\u{17F}\d_]+$/u;
 
 // @ts-ignore
 const getNewSelections$7 = (line, rowIndex, columnIndex) => {
@@ -21238,22 +21238,31 @@ const handleWheel$2 = (editor, deltaMode, eventDeltaX, eventDeltaY) => {
   return setDelta(editor, deltaMode, eventDeltaX, eventDeltaY);
 };
 
-// @ts-ignore
-const getChanges$2 = selections => {
+const getChanges$2 = editor => {
+  const {
+    lines,
+    selections
+  } = editor;
   const changes = [];
-  const rowsToIndentLess = [];
+  const rowsToIndentLess = new Set();
   for (let i = 0; i < selections.length; i += 4) {
     const selectionStartRow = selections[i];
     const selectionEndRow = selections[i + 2];
     for (let i = selectionStartRow; i <= selectionEndRow; i++) {
-      rowsToIndentLess.push(i);
+      rowsToIndentLess.add(i);
     }
   }
   for (const rowToIndent of rowsToIndentLess) {
+    const line = lines[rowToIndent];
+    const leadingWhitespace = line.match(/^[\t ]+/)?.[0] ?? '';
+    const whitespaceToRemove = leadingWhitespace.startsWith('\t') ? '\t' : leadingWhitespace.slice(0, editor.tabSize || 2);
+    if (!whitespaceToRemove) {
+      continue;
+    }
     changes.push({
-      deleted: ['  '],
+      deleted: [whitespaceToRemove],
       end: {
-        columnIndex: 2,
+        columnIndex: whitespaceToRemove.length,
         rowIndex: rowToIndent
       },
       inserted: [''],
@@ -21269,10 +21278,7 @@ const getChanges$2 = selections => {
 
 // @ts-ignore
 const indentLess = editor => {
-  const {
-    selections
-  } = editor;
-  const changes = getChanges$2(selections);
+  const changes = getChanges$2(editor);
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
@@ -28647,7 +28653,7 @@ const commandMap = {
   'Editor.hasCachedCharacterWidth': has$1,
   'Editor.hotReload': hotReload,
   'Editor.incrementSelection': wrapCommand(incrementSelection),
-  'Editor.indendLess': wrapCommand(indentLess),
+  'Editor.indentLess': wrapCommand(indentLess),
   'Editor.indentMore': wrapCommand(indentMore),
   'Editor.insertLineBreak': wrapCommand(insertLineBreak),
   'Editor.loadContent': wrapCommand(loadContent),

package/dist/editorWorkerMain.js

@@ -1461,6 +1461,12 @@ const {
   invokeAndTransfer: invokeAndTransfer$1,
   set: set$e
 } = create$c(RendererWorker);
+const initializeRendererWorkerForWorker = async commandMap => {
+  const rpc = await create$d({
+    commandMap
+  });
+  set$e(rpc);
+};
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
@@ -1515,6 +1521,26 @@ const openUri = async (uri, focus, options) => {
 const sendMessagePortToSyntaxHighlightingWorker$1 = async port => {
   await invokeAndTransfer$1('SendMessagePortToSyntaxHighlightingWorker.sendMessagePortToSyntaxHighlightingWorker', port, 'HandleMessagePort.handleMessagePort2');
 };
+const send$1 = async (port, sourceId = 0) => {
+  await sendMessagePortToOpenerWorker(port, sourceId);
+};
+const initializeOpenerWorker = async () => {
+  const rpc = await create$f({
+    commandMap: {},
+    send: send$1
+  });
+  set$g(rpc);
+};
+const send3 = port => {
+  return sendMessagePortToTextMeasurementWorker(port);
+};
+const initializeTextMeasurementWorker = async () => {
+  const rpc = await create$f({
+    commandMap: {},
+    send: send3
+  });
+  set$f(rpc);
+};
 
 const {
   invoke: invoke$d,
@@ -12370,7 +12396,7 @@ const dispose$5 = rpcId => {
     deliveries.delete(rpcId);
   }
 };
-const send$2 = (rpcId, rpc, status) => {
+const send = (rpcId, rpc, status) => {
   let delivery = deliveries.get(rpcId);
   if (!delivery || delivery.rpc !== rpc) {
     dispose$5(rpcId);
@@ -15683,7 +15709,7 @@ const getEditorStatus = editor => {
 const sendToListener = async (rpcId, status) => {
   const rpc = get$b(rpcId);
   if (rpc) {
-    await send$2(rpcId, rpc, status);
+    await send(rpcId, rpc, status);
   }
 };
 const initializeListener = async rpcId => {
@@ -20017,8 +20043,8 @@ const handleContextMenu = async (editor, button, x, y) => {
 /* eslint-disable sonarjs/super-linear-regex */
 
 // match all words, including umlauts, see https://stackoverflow.com/questions/5436824/matching-accented-characters-with-javascript-regexes/#answer-11550799
-const RE_WORD_START = /^[a-zA-Z\u{C0}-\u{17F}\d]+/u;
-const RE_WORD_END = /[a-zA-Z\u{C0}-\u{17F}\d]+$/u;
+const RE_WORD_START = /^[a-zA-Z\u{C0}-\u{17F}\d_]+/u;
+const RE_WORD_END = /[a-zA-Z\u{C0}-\u{17F}\d_]+$/u;
 
 // @ts-ignore
 const getNewSelections$7 = (line, rowIndex, columnIndex) => {
@@ -21663,22 +21689,31 @@ const handleWheel$2 = (editor, deltaMode, eventDeltaX, eventDeltaY) => {
   return setDelta(editor, deltaMode, eventDeltaX, eventDeltaY);
 };
 
-// @ts-ignore
-const getChanges$2 = selections => {
+const getChanges$2 = editor => {
+  const {
+    lines,
+    selections
+  } = editor;
   const changes = [];
-  const rowsToIndentLess = [];
+  const rowsToIndentLess = new Set();
   for (let i = 0; i < selections.length; i += 4) {
     const selectionStartRow = selections[i];
     const selectionEndRow = selections[i + 2];
     for (let i = selectionStartRow; i <= selectionEndRow; i++) {
-      rowsToIndentLess.push(i);
+      rowsToIndentLess.add(i);
     }
   }
   for (const rowToIndent of rowsToIndentLess) {
+    const line = lines[rowToIndent];
+    const leadingWhitespace = line.match(/^[\t ]+/)?.[0] ?? '';
+    const whitespaceToRemove = leadingWhitespace.startsWith('\t') ? '\t' : leadingWhitespace.slice(0, editor.tabSize || 2);
+    if (!whitespaceToRemove) {
+      continue;
+    }
     changes.push({
-      deleted: ['  '],
+      deleted: [whitespaceToRemove],
       end: {
-        columnIndex: 2,
+        columnIndex: whitespaceToRemove.length,
         rowIndex: rowToIndent
       },
       inserted: [''],
@@ -21694,10 +21729,7 @@ const getChanges$2 = selections => {
 
 // @ts-ignore
 const indentLess = editor => {
-  const {
-    selections
-  } = editor;
-  const changes = getChanges$2(selections);
+  const changes = getChanges$2(editor);
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
@@ -29069,7 +29101,7 @@ const commandMap = {
   'Editor.hasCachedCharacterWidth': has$1,
   'Editor.hotReload': hotReload,
   'Editor.incrementSelection': wrapCommand(incrementSelection),
-  'Editor.indendLess': wrapCommand(indentLess),
+  'Editor.indentLess': wrapCommand(indentLess),
   'Editor.indentMore': wrapCommand(indentMore),
   'Editor.insertLineBreak': wrapCommand(insertLineBreak),
   'Editor.loadContent': wrapCommand(loadContent),
@@ -29307,39 +29339,9 @@ const initializeExtensionManagementWorker = async () => {
   }
 };
 
-const send$1 = port => {
-  // @ts-ignore
-  return sendMessagePortToOpenerWorker(port);
-};
-const initializeOpenerWorker = async () => {
-  const rpc = await create$f({
-    commandMap: {},
-    send: send$1
-  });
-  set$g(rpc);
-};
-
-const initializeRendererWorker = async () => {
-  const rpc = await create$d({
-    commandMap: commandMap
-  });
-  set$e(rpc);
-};
-
-const send = port => {
-  return sendMessagePortToTextMeasurementWorker(port);
-};
-const initializeTextMeasurementWorker = async () => {
-  const rpc = await create$f({
-    commandMap: {},
-    send
-  });
-  set$f(rpc);
-};
-
 const listen = async () => {
   registerCommands(commandMap);
-  await Promise.all([initializeRendererWorker(), initializeDragAndDropWorker(), initializeErrorWorker(), initializeExtensionManagementWorker(), initializeTextMeasurementWorker(), initializeCacheWorker(), initializeOpenerWorker()]);
+  await Promise.all([initializeRendererWorkerForWorker(commandMap), initializeDragAndDropWorker(), initializeErrorWorker(), initializeExtensionManagementWorker(), initializeTextMeasurementWorker(), initializeCacheWorker(), initializeOpenerWorker()]);
   const dialogRpc = await create$f({
     commandMap: {},
     send: sendMessagePortToDialogWorker

package/package.json

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