@lvce-editor/editor-worker 19.60.1 → 19.60.3

package/dist/editorWorkerMain.js

@@ -1855,6 +1855,13 @@ const clamp = (num, min, max) => {
   return Math.min(Math.max(num, min), max);
 };
 
+const getScrollOffset = (deltaY, rowHeight) => {
+  return rowHeight > 0 ? deltaY % rowHeight : 0;
+};
+const getRenderedLineCount = (height, rowHeight, deltaY) => {
+  return height > 0 && rowHeight > 0 ? Math.ceil((height + getScrollOffset(deltaY, rowHeight)) / rowHeight) : 0;
+};
+
 const toMergeConflictActionsRow = rowIndex => ~rowIndex;
 const isMergeConflictActionsRow = viewRow => viewRow < 0;
 const getMergeConflictRowIndex = viewRow => ~viewRow;
@@ -2080,10 +2087,11 @@ const updateLayout = (editor, foldingRanges) => {
   const viewLineIndices = hasMergeConflictRows ? getViewLineIndices(lines.length, rowIndex => isRowHidden(rowIndex, foldingRanges), mergeConflicts) : [];
   const visibleLineCount = hasMergeConflictRows ? viewLineIndices.length : getVisibleLineCount(lines.length, foldingRanges);
   const finalY = Math.max(visibleLineCount - numberOfVisibleLines, 0);
-  const finalDeltaY = finalY * itemHeight;
+  const finalDeltaY = Math.max(visibleLineCount * itemHeight - height, 0);
   const deltaY = clamp(editor.deltaY, 0, finalDeltaY);
   const startVisualRow = Math.floor(deltaY / itemHeight);
-  const visibleViewLineIndices = hasMergeConflictRows ? getVisibleViewLineIndices(viewLineIndices, startVisualRow, numberOfVisibleLines) : getViewportLineIndices(lines.length, foldingRanges, startVisualRow, numberOfVisibleLines);
+  const renderedLineCount = getRenderedLineCount(height, itemHeight, deltaY);
+  const visibleViewLineIndices = hasMergeConflictRows ? getVisibleViewLineIndices(viewLineIndices, startVisualRow, renderedLineCount) : getViewportLineIndices(lines.length, foldingRanges, startVisualRow, renderedLineCount);
   const visibleLineIndices = hasMergeConflictRows ? getVisibleLineIndices(visibleViewLineIndices) : visibleViewLineIndices;
   const minLineY = visibleLineIndices[0] ?? 0;
   const maxLineY = visibleLineIndices.length === 0 ? 0 : visibleLineIndices.at(-1) + 1;
@@ -3214,7 +3222,7 @@ const getVisible$1 = async (editor, syncIncremental) => {
     width
   } = editor;
   const visibleLineIndices = editor.visibleLineIndices || Array.from({
-    length: Math.min(editor.numberOfVisibleLines, lines.length - editor.minLineY)
+    length: Math.min(editor.maxLineY ?? editor.minLineY + editor.numberOfVisibleLines, lines.length) - editor.minLineY
   }, (_, index) => editor.minLineY + index);
   if (visibleLineIndices.length === 0) {
     return {
@@ -3272,7 +3280,6 @@ const setDeltaY$1 = async (state, value) => {
     finalDeltaY,
     height,
     itemHeight,
-    numberOfVisibleLines,
     scrollBarHeight
   } = state;
   const newDeltaY = clamp(value, 0, finalDeltaY);
@@ -3280,8 +3287,9 @@ const setDeltaY$1 = async (state, value) => {
     return state;
   }
   const startVisualRow = Math.floor(newDeltaY / itemHeight);
+  const renderedLineCount = getRenderedLineCount(height, itemHeight, newDeltaY);
   const hasMergeConflictRows = state.viewLineIndices?.length > 0;
-  const visibleViewLineIndices = hasMergeConflictRows ? getVisibleViewLineIndices(state.viewLineIndices, startVisualRow, numberOfVisibleLines) : getViewportLineIndices(state.lines.length, state.foldingRanges || [], startVisualRow, numberOfVisibleLines);
+  const visibleViewLineIndices = hasMergeConflictRows ? getVisibleViewLineIndices(state.viewLineIndices, startVisualRow, renderedLineCount) : getViewportLineIndices(state.lines.length, state.foldingRanges || [], startVisualRow, renderedLineCount);
   const visibleLineIndices = hasMergeConflictRows ? getVisibleLineIndices(visibleViewLineIndices) : visibleViewLineIndices;
   const minLineY = visibleLineIndices[0] ?? 0;
   const maxLineY = visibleLineIndices.length === 0 ? 0 : visibleLineIndices.at(-1) + 1;
@@ -3666,10 +3674,10 @@ const resize = (state, dimensions, columnWidth = state.columnWidth) => {
   if (!('foldingRanges' in state)) {
     const total = state.lines.length;
     const finalY = Math.max(total - numberOfVisibleLines, 0);
-    const finalDeltaY = finalY * state.itemHeight;
+    const finalDeltaY = Math.max(total * state.itemHeight - height, 0);
     const deltaY = Math.min(state.deltaY, finalDeltaY);
     const minLineY = Math.floor(deltaY / state.itemHeight);
-    const maxLineY = Math.min(minLineY + numberOfVisibleLines, total);
+    const maxLineY = Math.min(minLineY + getRenderedLineCount(height, state.itemHeight, deltaY), total);
     const contentHeight = total * state.rowHeight;
     const scrollBarHeight = getScrollBarSize(height, contentHeight, state.minimumSliderSize);
     return {
@@ -12223,25 +12231,6 @@ const getBlockCommentEdits = (editor, blockComment) => {
   return changes;
 };
 
-const toggleBlockComment = async editor => {
-  const offset = getOffsetAtCursor$1(editor);
-  const blockComment = await getBlockComment(editor, offset);
-  if (!blockComment) {
-    return editor;
-  }
-  const edits = getBlockCommentEdits(editor, blockComment);
-  return scheduleDocument(editor, edits);
-};
-
-const toggleBreakpoint = editor => {
-  const [rowIndex] = editor.selections;
-  const breakPoints = editor.breakPoints.includes(rowIndex) ? editor.breakPoints.filter(breakPoint => breakPoint !== rowIndex) : [...editor.breakPoints, rowIndex];
-  return {
-    ...editor,
-    breakPoints
-  };
-};
-
 const getLineComment = async editor => {
   const languageConfiguration = await getLanguageConfiguration(editor);
   if (!languageConfiguration?.comments?.lineComment) {
@@ -12300,6 +12289,72 @@ const getLineCommentEdit = (rowIndex, line, lineComment) => {
   };
 };
 
+const getSelectedLineCommentEdits = (editor, lineComment) => {
+  const {
+    lines,
+    selections
+  } = editor;
+  const selectedRows = new Set();
+  for (let i = 0; i < selections.length; i += 4) {
+    const startRow = Math.min(selections[i], selections[i + 2]);
+    let endRow = Math.max(selections[i], selections[i + 2]);
+    const endColumn = selections[i + (selections[i] > selections[i + 2] ? 1 : 3)];
+    if (endRow > startRow && endColumn === 0) {
+      endRow--;
+    }
+    for (let row = startRow; row <= endRow; row++) {
+      if (lines[row].trim()) {
+        selectedRows.add(row);
+      }
+    }
+  }
+  const rows = [...selectedRows].toSorted((a, b) => a - b);
+  const remove = rows.every(row => lines[row].trimStart().startsWith(lineComment));
+  return rows.map(rowIndex => {
+    const line = lines[rowIndex];
+    if (remove) {
+      return getLineCommentEdit(rowIndex, line, lineComment);
+    }
+    const columnIndex = line.length - line.trimStart().length;
+    return {
+      deleted: [''],
+      end: {
+        columnIndex,
+        rowIndex
+      },
+      inserted: [`${lineComment} `],
+      origin: ToggleBlockComment$1,
+      start: {
+        columnIndex,
+        rowIndex
+      }
+    };
+  });
+};
+
+const toggleBlockComment = async editor => {
+  const offset = getOffsetAtCursor$1(editor);
+  const blockComment = await getBlockComment(editor, offset);
+  if (!blockComment) {
+    const lineComment = await getLineComment(editor);
+    if (!lineComment) {
+      return editor;
+    }
+    return scheduleDocumentAndCursorsSelections(editor, getSelectedLineCommentEdits(editor, lineComment));
+  }
+  const edits = getBlockCommentEdits(editor, blockComment);
+  return scheduleDocument(editor, edits);
+};
+
+const toggleBreakpoint = editor => {
+  const [rowIndex] = editor.selections;
+  const breakPoints = editor.breakPoints.includes(rowIndex) ? editor.breakPoints.filter(breakPoint => breakPoint !== rowIndex) : [...editor.breakPoints, rowIndex];
+  return {
+    ...editor,
+    breakPoints
+  };
+};
+
 const editorToggleLineComment = async editor => {
   const lineComment = await getLineComment(editor);
   if (!lineComment) {
@@ -14873,8 +14928,10 @@ const renderAdditionalFocusContext$1 = (oldState, newState) => {
   return ['Viewlet.unsetAdditionalFocus', newState.uid, oldState.additionalFocus];
 };
 
-const getCss = (uid, rowHeight, scrollBarHeight, scrollBarTop, scrollBarWidth, scrollBarLeft) => {
+const getCss = (uid, rowHeight, scrollBarHeight, scrollBarTop, scrollBarWidth, scrollBarLeft, deltaY = 0) => {
   const editorSelector = `.Editor[data-uid="${uid}"]`;
+  const scrollOffset = getScrollOffset(deltaY, rowHeight);
+  const translate = scrollOffset === 0 ? 'none' : `0px -${scrollOffset}px`;
   return `${editorSelector} {
   --EditorRowHeight: ${rowHeight}px;
   --ScrollBarHeight: ${scrollBarHeight}px;
@@ -14882,13 +14939,33 @@ const getCss = (uid, rowHeight, scrollBarHeight, scrollBarTop, scrollBarWidth, s
   --ScrollBarWidth: ${scrollBarWidth}px;
   --ScrollBarLeft: ${scrollBarLeft}px;
 }
+${editorSelector} .EditorLayers {
+  height: calc(100% + var(--EditorRowHeight));
+  translate: ${translate};
+}
+${editorSelector} .GutterRows {
+  flex: none;
+  width: 100%;
+  translate: ${translate};
+}
+${editorSelector} .EditorRows,
+${editorSelector} .GutterRows {
+  display: flex;
+  flex-direction: column;
+}
+${editorSelector} .EditorRow,
+${editorSelector} .LineNumber {
+  flex: none;
+}
 ${editorSelector} .EditorRow {
+  contain: size style;
   height: var(--EditorRowHeight);
   line-height: var(--EditorRowHeight);
 }
 ${editorSelector} .MergeConflictActions,
 ${editorSelector} .MergeConflictActionsGutter {
   box-sizing: border-box;
+  flex: none;
   height: var(--EditorRowHeight);
   line-height: var(--EditorRowHeight);
 }
@@ -14926,6 +15003,7 @@ ${editorSelector} .EditorLineDecoration {
   user-select: none;
 }
 ${editorSelector} .LineNumber {
+  contain: content;
   position: relative;
 }
 ${editorSelector} .EditorGutterDecoration {
@@ -14989,7 +15067,7 @@ const renderCss$1 = (oldState, newState) => {
   const scrollBarTop = getScrollBarY(deltaY, finalDeltaY, height, scrollBarHeight);
   const scrollBarWidth = getScrollBarSize(width, longestLineWidth, minimumSliderSize);
   const scrollBarLeft = getScrollBarLeft(deltaX, longestLineWidth, width);
-  const css = getCss(uid, rowHeight, scrollBarHeight, scrollBarTop, scrollBarWidth, scrollBarLeft);
+  const css = getCss(uid, rowHeight, scrollBarHeight, scrollBarTop, scrollBarWidth, scrollBarLeft, deltaY);
   return [SetCss$1, uid, css];
 };
 
@@ -15457,13 +15535,20 @@ const getGutterInfoVirtualDom = (gutterInfo, activeLineNumber) => {
 };
 const getEditorGutterVirtualDom$1 = (gutterInfos, activeLineNumber = -1) => {
   const dom = gutterInfos.flatMap(gutterInfo => getGutterInfoVirtualDom(gutterInfo, activeLineNumber));
-  return dom;
+  if (gutterInfos.length === 0) {
+    return [];
+  }
+  return [{
+    childCount: gutterInfos.length,
+    className: 'GutterRows',
+    type: Div
+  }, ...dom];
 };
 
 const getEditorGutterVirtualDom = (gutterInfos, activeLineNumber = -1) => {
   const gutterDom = getEditorGutterVirtualDom$1([...gutterInfos], activeLineNumber);
   return [{
-    childCount: gutterInfos.length,
+    childCount: gutterInfos.length === 0 ? 0 : 1,
     className: 'Gutter',
     type: Div
   }, ...gutterDom];

package/package.json

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