@lvce-editor/editor-worker 19.70.1 → 19.70.3

package/dist/editorWorkerMain.js

@@ -8785,9 +8785,64 @@ const cursorDown = editor => {
   return scheduleSelections(editor, newSelections);
 };
 
+const getSelectionsAtLineEnd = (selections, lines) => {
+  const newSelections = new Uint32Array(selections.length);
+  for (let i = 0; i < selections.length; i += 4) {
+    const [selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn] = getSelectionPairs(selections, i);
+    const rowIndex = selectionStartRow === selectionEndRow && selectionStartColumn === selectionEndColumn ? selectionStartRow : selectionEndRow;
+    const columnIndex = selectionStartRow === selectionEndRow && selectionStartColumn === selectionEndColumn ? getLineLength(lines[rowIndex]) : selectionEndColumn;
+    newSelections[i] = rowIndex;
+    newSelections[i + 1] = columnIndex;
+    newSelections[i + 2] = rowIndex;
+    newSelections[i + 3] = columnIndex;
+  }
+  return newSelections;
+};
+const removeDuplicateSelections = (editor, selections) => {
+  const uniqueSelections = new Uint32Array(selections.length);
+  const selectionIndices = new Map();
+  const primarySelectionIndex = editor.primarySelectionIndex || 0;
+  let uniqueSelectionCount = 0;
+  let newPrimarySelectionIndex = 0;
+  for (let i = 0; i < selections.length; i += 4) {
+    const rowIndex = selections[i + 2];
+    const columnIndex = selections[i + 3];
+    const key = `${rowIndex}:${columnIndex}`;
+    const existingSelectionIndex = selectionIndices.get(key);
+    if (existingSelectionIndex !== undefined) {
+      if (i === primarySelectionIndex) {
+        newPrimarySelectionIndex = existingSelectionIndex * 4;
+      }
+      continue;
+    }
+    selectionIndices.set(key, uniqueSelectionCount);
+    uniqueSelections.set(selections.subarray(i, i + 4), uniqueSelectionCount * 4);
+    if (i === primarySelectionIndex) {
+      newPrimarySelectionIndex = uniqueSelectionCount * 4;
+    }
+    uniqueSelectionCount++;
+  }
+  return {
+    primarySelectionIndex: newPrimarySelectionIndex,
+    selections: uniqueSelections.slice(0, uniqueSelectionCount * 4)
+  };
+};
+
 // @ts-ignore
 const cursorEnd = editor => {
-  return editorCursorHorizontalRight(editor, lineEnd);
+  const {
+    lines,
+    selections: oldSelections
+  } = editor;
+  const movedSelections = getSelectionsAtLineEnd(oldSelections, lines);
+  const {
+    primarySelectionIndex,
+    selections
+  } = removeDuplicateSelections(editor, movedSelections);
+  return scheduleSelections({
+    ...editor,
+    primarySelectionIndex
+  }, selections);
 };
 
 // @ts-ignore
@@ -16930,8 +16985,8 @@ const getEditorRowsVirtualDom$1 = (textInfos, differences, lineNumbers = true, h
   return dom;
 };
 
-const getEditorRowsVirtualDom = (textInfos, differences, lineNumbers = true, highlightedLine = -1, visibleLineIndices = [], endOfLineDecorations = [], visibleViewLineIndices = [], problemsHighlightedRow = -1) => {
-  const rowsDom = getEditorRowsVirtualDom$1(textInfos, differences, lineNumbers, highlightedLine, visibleLineIndices, endOfLineDecorations, visibleViewLineIndices, problemsHighlightedRow);
+const getEditorRowsVirtualDom = (textInfos, differences, lineNumbers = true, highlightedLine = -1, visibleLineIndices = [], endOfLineDecorations = [], visibleViewLineIndices = [], problemsHighlightedRow = -1, unnecessaryDiagnostics = []) => {
+  const rowsDom = getEditorRowsVirtualDom$1(textInfos, differences, lineNumbers, highlightedLine, visibleLineIndices, endOfLineDecorations, visibleViewLineIndices, problemsHighlightedRow, unnecessaryDiagnostics);
   return [{
     childCount: visibleViewLineIndices.length || textInfos.length,
     className: 'EditorRows',
@@ -17028,8 +17083,8 @@ const editorLayersNode = {
   className: 'EditorLayers',
   type: Div
 };
-const getEditorLayersVirtualDom = (selectionInfos, textInfos, differences, lineNumbers = true, highlightedLine = -1, cursorInfos = [], diagnostics = [], visibleLineIndices = [], endOfLineDecorations = [], bracketMatchInfos = [], focused = true, visibleViewLineIndices = [], problemsHighlightedRow = -1, roundedSelection = false) => {
-  return [editorLayersNode, ...getEditorSelectionsVirtualDom(selectionInfos, focused, roundedSelection), ...getEditorRowsVirtualDom(textInfos, differences, lineNumbers, highlightedLine, visibleLineIndices, endOfLineDecorations, visibleViewLineIndices, problemsHighlightedRow), ...getEditorCursorsVirtualDom(cursorInfos, focused), ...getEditorDiagnosticsVirtualDom(diagnostics, bracketMatchInfos)];
+const getEditorLayersVirtualDom = (selectionInfos, textInfos, differences, lineNumbers = true, highlightedLine = -1, cursorInfos = [], diagnostics = [], visibleLineIndices = [], endOfLineDecorations = [], bracketMatchInfos = [], focused = true, visibleViewLineIndices = [], problemsHighlightedRow = -1, roundedSelection = false, unnecessaryDiagnostics = []) => {
+  return [editorLayersNode, ...getEditorSelectionsVirtualDom(selectionInfos, focused, roundedSelection), ...getEditorRowsVirtualDom(textInfos, differences, lineNumbers, highlightedLine, visibleLineIndices, endOfLineDecorations, visibleViewLineIndices, problemsHighlightedRow, unnecessaryDiagnostics), ...getEditorCursorsVirtualDom(cursorInfos, focused), ...getEditorDiagnosticsVirtualDom(diagnostics, bracketMatchInfos)];
 };
 
 const getEditorScrollBarDiagnosticsVirtualDom = scrollBarDiagnostics => {
@@ -17110,13 +17165,14 @@ const getEditorContentVirtualDom = ({
   scrollBarWidth = 0,
   selectionInfos = [],
   textInfos,
+  unnecessaryDiagnostics = [],
   visibleLineIndices = [],
   visibleViewLineIndices = []
 }) => {
   return [{
     ...editorContentNode,
     className: breadcrumbsEnabled ? 'EditorContent EditorBreadcrumbsOffset' : 'EditorContent'
-  }, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics, visibleLineIndices, endOfLineDecorations, bracketMatchInfos, focused, visibleViewLineIndices, problemsHighlightedRow, roundedSelection), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom(scrollBarHeight, scrollBarWidth)];
+  }, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics, visibleLineIndices, endOfLineDecorations, bracketMatchInfos, focused, visibleViewLineIndices, problemsHighlightedRow, roundedSelection, unnecessaryDiagnostics), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom(scrollBarHeight, scrollBarWidth)];
 };
 
 const getGutterInfoVirtualDom = (gutterInfo, activeLineNumber) => {
@@ -17288,6 +17344,7 @@ const getEditorVirtualDom = ({
   selections = new Uint32Array(),
   textInfos,
   uid,
+  unnecessaryDiagnostics = [],
   uri = '',
   visibleLineIndices,
   visibleViewLineIndices = [],
@@ -17345,6 +17402,7 @@ const getEditorVirtualDom = ({
     scrollBarWidth,
     selectionInfos,
     textInfos: combineWhitespaceTokens$1 ? textInfos.map(combineWhitespaceTokens) : textInfos,
+    unnecessaryDiagnostics,
     visibleLineIndices: visibleLineIndices || [],
     visibleViewLineIndices
   }), ...minimapDom];
@@ -17520,7 +17578,8 @@ const getDom = state => {
     ...state,
     diagnostics: visualDecorations,
     scrollBarDiagnostics: getScrollBarDiagnostics(state, diagnostics),
-    scrollBarWidth: getScrollBarSize(width, longestLineWidth, minimumSliderSize)
+    scrollBarWidth: getScrollBarSize(width, longestLineWidth, minimumSliderSize),
+    unnecessaryDiagnostics: diagnostics
   });
 };
 const mergeConflictsEqual = (oldState, newState) => {
@@ -17699,7 +17758,7 @@ const renderLines = {
     const dom = getEditorRowsVirtualDom$1(textInfos, differences, true, highlightedLine, visibleLineIndices, endOfLineDecorations, visibleViewLineIndices, newState.problemsHighlightedRow, diagnostics || []);
     return [/* method */'setText', dom];
   },
-  isEqual: (oldState, newState) => oldState.lines === newState.lines && oldState.foldingRanges === newState.foldingRanges && oldState.visibleViewLineIndices === newState.visibleViewLineIndices && oldState.tokenizerId === newState.tokenizerId && oldState.minLineY === newState.minLineY && oldState.decorations === newState.decorations && oldState.embeds === newState.embeds && oldState.endOfLineDecorations === newState.endOfLineDecorations && oldState.deltaX === newState.deltaX && oldState.width === newState.width && oldState.highlightedLine === newState.highlightedLine && oldState.problemsHighlightedRow === newState.problemsHighlightedRow && oldState.debugEnabled === newState.debugEnabled
+  isEqual: (oldState, newState) => oldState.lines === newState.lines && oldState.foldingRanges === newState.foldingRanges && oldState.visibleViewLineIndices === newState.visibleViewLineIndices && oldState.tokenizerId === newState.tokenizerId && oldState.minLineY === newState.minLineY && oldState.decorations === newState.decorations && oldState.embeds === newState.embeds && oldState.endOfLineDecorations === newState.endOfLineDecorations && oldState.diagnostics === newState.diagnostics && oldState.deltaX === newState.deltaX && oldState.width === newState.width && oldState.highlightedLine === newState.highlightedLine && oldState.problemsHighlightedRow === newState.problemsHighlightedRow && oldState.debugEnabled === newState.debugEnabled
 };
 const renderSelections = {
   apply: (oldState, newState) => {

package/package.json

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