@lvce-editor/editor-worker 19.69.4 → 19.69.6

package/dist/editorWorkerMain.js

@@ -1234,7 +1234,7 @@ const create$c = rpcId => {
   };
 };
 
-const Text = 12;
+const Text$1 = 12;
 const Reference = 100;
 
 const AltKey = 'event.altKey';
@@ -3986,7 +3986,7 @@ const moveRangeToPosition$1 = (selections, i, rowIndex, columnIndex) => {
   selections[i] = selections[i + 2] = rowIndex;
   selections[i + 1] = selections[i + 3] = columnIndex;
 };
-const isEmpty = (selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn) => {
+const isEmpty$1 = (selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn) => {
   return selectionStartRow === selectionEndRow && selectionStartColumn === selectionEndColumn;
 };
 const isSelectionSingleLine = (selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn) => {
@@ -4005,7 +4005,7 @@ const isEverySelection = (selections, fn) => {
   return true;
 };
 const isEverySelectionEmpty = selections => {
-  return isEverySelection(selections, isEmpty);
+  return isEverySelection(selections, isEmpty$1);
 };
 const isEverySelectionSingleLine = selections => {
   return isEverySelection(selections, isSelectionSingleLine);
@@ -4103,7 +4103,7 @@ const getVisible = async editor => {
     const endLine = lines[selectionEndRow];
     const endLineEndX = await getX(endLine, selectionEndColumn, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, endLineDifference);
     const endLineY = relativeEndLineRow * rowHeight;
-    if (isEmpty(selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn) && endLineEndX > 0) {
+    if (isEmpty$1(selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn) && endLineEndX > 0) {
       visibleCursors.push(endLineEndX, endLineY);
       continue;
     }
@@ -6142,14 +6142,27 @@ const dispose$3 = async () => {
 };
 
 const renderedDoms = new Map();
+const textAppendPaths = new Map();
 const get$1 = uid => {
   return renderedDoms.get(uid);
 };
-const set$1 = (uid, dom) => {
+const set$1 = (uid, dom, paths) => {
   renderedDoms.set(uid, dom);
+  setTextAppendPaths(uid, paths);
+};
+const getTextAppendPaths$1 = uid => {
+  return textAppendPaths.get(uid);
+};
+const setTextAppendPaths = (uid, paths) => {
+  if (paths) {
+    textAppendPaths.set(uid, paths);
+  } else {
+    textAppendPaths.delete(uid);
+  }
 };
 const dispose$2 = uid => {
   renderedDoms.delete(uid);
+  textAppendPaths.delete(uid);
 };
 
 const addWidget$1 = widget => {
@@ -8947,7 +8960,7 @@ const getChanges$5 = (lines, selections, getDelta) => {
 };
 
 const isAutoClosingPairDelete = (autoClosingRanges, startRowIndex, startColumnIndex, endRowIndex, endColumnIndex) => {
-  if (!isEmpty(startRowIndex, startColumnIndex, endRowIndex, endColumnIndex)) {
+  if (!isEmpty$1(startRowIndex, startColumnIndex, endRowIndex, endColumnIndex)) {
     return false;
   }
   if (startColumnIndex < 1) {
@@ -11245,7 +11258,7 @@ const getChanges = (lines, selections, languageConfiguration, indentUnit) => {
       end,
       start
     };
-    if (isEmpty(selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn)) {
+    if (isEmpty$1(selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn)) {
       const line = lines[selectionStartRow];
       const before = line.slice(0, selectionStartColumn);
       const after = line.slice(selectionStartColumn);
@@ -14118,6 +14131,7 @@ const Button$1 = 1;
 const Div = 4;
 const Input = 6;
 const Span = 8;
+const Text = 12;
 const Img = 17;
 const Nav = 40;
 const TextArea = 62;
@@ -14126,7 +14140,7 @@ const text = data => {
   return {
     childCount: 0,
     text: data,
-    type: Text
+    type: Text$1
   };
 };
 
@@ -14215,7 +14229,7 @@ const compareNodes = (oldNode, newNode) => {
     });
   }
   // Handle text nodes
-  if (oldNode.type === Text && newNode.type === Text) {
+  if (oldNode.type === Text$1 && newNode.type === Text$1) {
     if (oldNode.text !== newNode.text) {
       patches.push({
         type: SetText,
@@ -14437,7 +14451,7 @@ const hoverSashNode = {
   onPointerDown: HandleSashPointerDown,
   type: Div
 };
-const getChildCount = (lineInfos, documentationVirtualDom, diagnostics) => {
+const getChildCount$1 = (lineInfos, documentationVirtualDom, diagnostics) => {
   const documentationCount = documentationVirtualDom.length > 0 ? 1 : 0;
   const diagnosticsCount = diagnostics && diagnostics.length > 0 ? 1 : 0;
   return (lineInfos.length > 0 ? 1 : 0) + documentationCount + diagnosticsCount;
@@ -14449,7 +14463,7 @@ const getEditorHoverClassName = (lineInfos, documentationVirtualDom, diagnostics
 const getHoverVirtualDom = (lineInfos, documentationVirtualDom, diagnostics, editorUid = 0) => {
   const dom = [];
   dom.push({
-    childCount: getChildCount(lineInfos, documentationVirtualDom, diagnostics) + 1,
+    childCount: getChildCount$1(lineInfos, documentationVirtualDom, diagnostics) + 1,
     className: getEditorHoverClassName(lineInfos, documentationVirtualDom, diagnostics),
     'data-uid': editorUid,
     onMouseOut: HandleMouseOut,
@@ -17199,6 +17213,147 @@ const getScrollBarDiagnostics = (editor, diagnostics) => {
   return scrollBarDecorations;
 };
 
+const getChildCount = node => node.childCount || 0;
+const getTextAppendPaths = dom => {
+  if (dom.length === 0) {
+    return undefined;
+  }
+  let textIndex = -1;
+  let cursorIndex = -1;
+  let textPath = [];
+  let cursorPath = [];
+  let numberOfRows = 0;
+  let numberOfCursors = 0;
+  const visit = (index, path) => {
+    const node = dom[index];
+    if (!node) {
+      return index;
+    }
+    if (node.className === 'EditorRow' || node.className?.startsWith('EditorRow ')) {
+      numberOfRows++;
+      const span = dom[index + 1];
+      const text = dom[index + 2];
+      if (node.childCount !== 1 || span?.type !== Span || span.childCount !== 1 || text?.type !== Text) {
+        numberOfRows = -100;
+      } else {
+        textIndex = index + 2;
+        textPath = [...path, 0, 0];
+      }
+    }
+    if (node.className === 'EditorCursor') {
+      numberOfCursors++;
+      if (node.childCount === 0) {
+        cursorIndex = index;
+        cursorPath = path;
+      } else {
+        numberOfCursors = -100;
+      }
+    }
+    let nextIndex = index + 1;
+    const childCount = getChildCount(node);
+    for (let childIndex = 0; childIndex < childCount; childIndex++) {
+      nextIndex = visit(nextIndex, [...path, childIndex]);
+    }
+    return nextIndex;
+  };
+  const endIndex = visit(0, []);
+  if (endIndex !== dom.length || numberOfRows !== 1 || numberOfCursors !== 1 || textIndex < 0 || cursorIndex < 0) {
+    return undefined;
+  }
+  return {
+    cursorIndex,
+    cursorPath,
+    textIndex,
+    textPath
+  };
+};
+const isEmpty = value => !value || value.length === 0;
+const sameValues = (left = [], right = []) => {
+  return left.length === right.length && left.every((value, index) => value === right[index]);
+};
+const isPlainTextLine = ({
+  languageId,
+  lines,
+  textInfos
+}) => {
+  return languageId === 'plaintext' && lines.length === 1 && textInfos.length === 1 && textInfos[0]?.length === 2 && textInfos[0][0] === lines[0];
+};
+const canRenderPlainTextAppend = (oldState, newState) => {
+  const {
+    lines: oldLines,
+    textInfos: oldTextInfos
+  } = oldState;
+  const {
+    lines: newLines,
+    textInfos: newTextInfos
+  } = newState;
+  if (!isPlainTextLine(oldState) || !isPlainTextLine(newState)) {
+    return false;
+  }
+  const oldLine = oldLines[0];
+  const newLine = newLines[0];
+  if (newLine.length <= oldLine.length || !newLine.startsWith(oldLine) || /[\r\n]/.test(newLine.slice(oldLine.length))) {
+    return false;
+  }
+  if (oldState.initial || newState.initial || !oldState.focused || !newState.focused || oldState.uid !== newState.uid || oldTextInfos[0][1] !== newTextInfos[0][1] || oldState.cursorInfos.length !== 1 || newState.cursorInfos.length !== 1 || oldState.selectionInfos.length > 0 || newState.selectionInfos.length > 0 || oldState.selections.length !== 4 || newState.selections.length !== 4 || oldState.selections[0] !== 0 || oldState.selections[1] !== oldLine.length || oldState.selections[2] !== 0 || oldState.selections[3] !== oldLine.length || newState.selections[0] !== 0 || newState.selections[1] !== newLine.length || newState.selections[2] !== 0 || newState.selections[3] !== newLine.length) {
+    return false;
+  }
+  if (oldState.breadcrumbsEnabled || newState.breadcrumbsEnabled || oldState.minimapEnabled || newState.minimapEnabled || oldState.lineNumbers !== newState.lineNumbers || oldState.highlightActiveLineNumber !== newState.highlightActiveLineNumber || oldState.highlightedLine !== newState.highlightedLine || oldState.problemsHighlightedRow !== newState.problemsHighlightedRow || oldState.focused !== newState.focused || oldState.roundedSelection !== newState.roundedSelection || oldState.width !== newState.width || oldState.height !== newState.height || oldState.minimumSliderSize !== newState.minimumSliderSize || getScrollBarSize(oldState.width, oldState.longestLineWidth, oldState.minimumSliderSize) !== getScrollBarSize(newState.width, newState.longestLineWidth, newState.minimumSliderSize) || oldState.minLineY !== newState.minLineY || oldState.maxLineY !== newState.maxLineY || !sameValues(oldState.visibleLineIndices, newState.visibleLineIndices) || !sameValues(oldState.visibleViewLineIndices, newState.visibleViewLineIndices) || oldState.differences !== newState.differences && !sameValues(oldState.differences, newState.differences) || oldState.scrollBarHeight !== newState.scrollBarHeight || oldState.uri !== newState.uri || oldState.workspaceUri !== newState.workspaceUri || oldState.assetDir !== newState.assetDir || oldState.loadError !== newState.loadError || oldState.combineWhitespaceTokens !== newState.combineWhitespaceTokens || oldState.widgets?.length > 0 || newState.widgets?.length > 0 || oldState.mergeConflicts.length > 0 || newState.mergeConflicts.length > 0 || !isEmpty(oldState.diagnostics) || !isEmpty(newState.diagnostics) || !isEmpty(oldState.visualDecorations) || !isEmpty(newState.visualDecorations) || !isEmpty(oldState.bracketMatchInfos) || !isEmpty(newState.bracketMatchInfos) || !isEmpty(oldState.endOfLineDecorations) || !isEmpty(newState.endOfLineDecorations) || !isEmpty(oldState.gutterDecorations) || !isEmpty(newState.gutterDecorations) || !isEmpty(oldState.breakPoints) || !isEmpty(newState.breakPoints)) {
+    return false;
+  }
+  return true;
+};
+const getTextAppendPatches = (state, paths) => {
+  const {
+    cursorInfos,
+    lines
+  } = state;
+  const patches = [];
+  for (const index of paths.textPath) {
+    patches.push({
+      index,
+      type: 7
+    }); // NavigateChild
+  }
+  patches.push({
+    type: 1,
+    value: lines[0]
+  }); // SetText
+  for (let index = 0; index < paths.textPath.length; index++) {
+    patches.push({
+      type: 8
+    }); // NavigateParent
+  }
+  for (const index of paths.cursorPath) {
+    patches.push({
+      index,
+      type: 7
+    }); // NavigateChild
+  }
+  patches.push({
+    key: 'translate',
+    type: 3,
+    value: cursorInfos[0]
+  }); // SetAttribute
+  return patches;
+};
+const updateTextAppendDom = (oldDom, state, paths) => {
+  const {
+    cursorInfos,
+    lines
+  } = state;
+  const newDom = [...oldDom];
+  newDom[paths.textIndex] = {
+    ...oldDom[paths.textIndex],
+    text: lines[0]
+  };
+  newDom[paths.cursorIndex] = {
+    ...oldDom[paths.cursorIndex],
+    translate: cursorInfos[0]
+  };
+  return newDom;
+};
+
 const getDom = state => {
   const {
     diagnostics = [],
@@ -17228,13 +17383,22 @@ const mergeConflictsEqual = (oldState, newState) => {
   });
 };
 const renderIncremental = (oldState, newState) => {
+  const renderedDom = get$1(newState.uid);
+  const textAppendPaths = getTextAppendPaths$1(newState.uid);
+  if (renderedDom && textAppendPaths && canRenderPlainTextAppend(oldState, newState)) {
+    const newDom = updateTextAppendDom(renderedDom, newState, textAppendPaths);
+    set$1(newState.uid, newDom, textAppendPaths);
+    const patches = getTextAppendPatches(newState, textAppendPaths);
+    return [SetPatches, newState.uid, patches];
+  }
   const oldDom = oldState.initial || !mergeConflictsEqual(oldState, newState) ? getDom(oldState) : get$1(newState.uid) || getDom(oldState);
   const newDom = getDom(newState);
   const patches = diffTree(oldDom, newDom);
+  const newTextAppendPaths = newState.languageId === 'plaintext' && newState.lines.length === 1 ? getTextAppendPaths(newDom) : undefined;
+  set$1(newState.uid, newDom, newTextAppendPaths);
   if (patches.length === 0) {
     return [];
   }
-  set$1(newState.uid, newDom);
   return [SetPatches, newState.uid, patches];
 };
 

package/dist/settings.json

@@ -456,7 +456,17 @@
     "description": "The modifier to be used to add multiple cursors with the mouse",
     "heading": "Multi Cursor Modifier",
     "id": "editor.multiCursorModifier",
-    "type": "string",
+    "options": [
+      {
+        "id": "alt",
+        "label": "Alt"
+      },
+      {
+        "id": "ctrlCmd",
+        "label": "Ctrl/Cmd"
+      }
+    ],
+    "type": "enum",
     "value": "alt"
   },
   {

package/package.json

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