@lvce-editor/editor-worker 19.72.1 → 19.72.2

package/dist/editorWorkerMain.js

@@ -4155,18 +4155,15 @@ const getX = async (line, column, fontWeight, fontSize, fontFamily, isMonospaceF
   number(averageCharWidth);
   number(difference);
   if (column === 0) {
-    return 0;
+    return difference === 0 ? 0 : Math.min(width, difference);
   }
   // TODO support non-monospace font, emoji, tab character, zero width characters
-  if (column * averageCharWidth > width) {
-    return width;
-  }
   const normalize = shouldNormalizeText(line);
   const normalizedLine = normalizeText(line, normalize, tabSize);
   const tabCount = getTabCount(line.slice(0, column));
-  const partialText = normalizedLine.slice(0, column + tabCount);
+  const partialText = normalizedLine.slice(0, column + tabCount * (tabSize - 1));
   const textWidth = await measureTextWidth(partialText, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, averageCharWidth);
-  return textWidth - halfCursorWidth + difference;
+  return Math.min(width, textWidth - halfCursorWidth + difference);
 };
 
 const px = value => {
@@ -4278,7 +4275,6 @@ const getVisible = async editor => {
     charWidth,
     cursorWidth,
     deltaY,
-    differences,
     focused,
     foldingRanges = [],
     fontFamily,
@@ -4307,7 +4303,7 @@ const getVisible = async editor => {
   const startVisualRow = itemHeight ? Math.floor(deltaY / itemHeight) : getVisualRow(minLineY);
   const endVisualRow = startVisualRow + (visibleViewLineIndices?.length || actualVisibleLineIndices.length);
   const getRelativeRow = rowIndex => getVisualRow(rowIndex) - startVisualRow;
-  const getDifference = rowIndex => differences[actualVisibleLineIndices.indexOf(rowIndex)];
+  const horizontalOffset = -(editor.deltaX ?? 0);
   for (let i = 0; i < selections.length; i += 4) {
     const [selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn, reversed] = getSelectionPairs(selections, i);
     const selectionStartVisualRow = getVisualRow(selectionStartRow);
@@ -4316,7 +4312,7 @@ const getVisible = async editor => {
       continue;
     }
     const relativeEndLineRow = getRelativeRow(selectionEndRow);
-    const endLineDifference = getDifference(selectionEndRow);
+    const endLineDifference = horizontalOffset;
     const endLine = lines[selectionEndRow];
     const endLineEndX = await getX(endLine, selectionEndColumn, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, endLineDifference);
     const endLineY = relativeEndLineRow * rowHeight;
@@ -4326,7 +4322,7 @@ const getVisible = async editor => {
     }
     const startLineYRelative = getRelativeRow(selectionStartRow);
     const startLineY = startLineYRelative * rowHeight;
-    const startLineDifference = getDifference(selectionStartRow);
+    const startLineDifference = horizontalOffset;
     if (selectionStartRow === selectionEndRow) {
       const startX = await getX(endLine, selectionStartColumn, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, startLineDifference);
       if (reversed) {
@@ -4353,7 +4349,7 @@ const getVisible = async editor => {
         const currentLine = lines[rowIndex];
         const relativeLine = getRelativeRow(rowIndex);
         const currentLineY = relativeLine * rowHeight;
-        const difference = getDifference(rowIndex);
+        const difference = horizontalOffset;
         const selectionWidth = await getX(currentLine, currentLine.length, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, difference);
         visibleSelections.push(0, currentLineY, selectionWidth, rowHeight);
       }
@@ -5315,6 +5311,7 @@ const getVisibleDiagnostics = async (editor, diagnostics) => {
   const visibleDiagnostics = [];
   const {
     charWidth,
+    deltaX = 0,
     deltaY,
     fontFamily,
     fontSize,
@@ -5325,8 +5322,7 @@ const getVisibleDiagnostics = async (editor, diagnostics) => {
     lines,
     rowHeight,
     tabSize,
-    viewLineIndices,
-    width
+    viewLineIndices
   } = editor;
   const startVisualRow = itemHeight ? Math.floor(deltaY / itemHeight) : editor.minLineY || 0;
   for (const diagnostic of diagnostics) {
@@ -5335,10 +5331,10 @@ const getVisibleDiagnostics = async (editor, diagnostics) => {
       endColumnIndex,
       rowIndex
     } = diagnostic;
-    const endLineDifference = 0;
+    const endLineDifference = -deltaX;
     const halfCursorWidth = 0;
-    const x = await getX(lines[rowIndex], columnIndex, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, charWidth, endLineDifference);
-    const endX = await getX(lines[rowIndex], endColumnIndex, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, charWidth, endLineDifference);
+    const x = await getX(lines[rowIndex], columnIndex, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, Infinity, charWidth, endLineDifference);
+    const endX = await getX(lines[rowIndex], endColumnIndex, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, Infinity, charWidth, endLineDifference);
     const diagnosticWidth = Math.max(charWidth, endX - x);
     const visualRow = viewLineIndices ? getVisualRowForDocumentRow$1(rowIndex, viewLineIndices) : rowIndex;
     const y = (visualRow - startVisualRow) * rowHeight;
@@ -5417,10 +5413,10 @@ const updateHorizontalLayout = async state => {
 };
 
 const shouldUpdateDiagnosticData = (oldState, newState) => {
-  return oldState.diagnostics !== newState.diagnostics || (newState.diagnostics?.length ?? 0) > 0 && (oldState.minLineY !== newState.minLineY || oldState.charWidth !== newState.charWidth || oldState.fontFamily !== newState.fontFamily || oldState.fontSize !== newState.fontSize || oldState.fontWeight !== newState.fontWeight || oldState.isMonospaceFont !== newState.isMonospaceFont || oldState.letterSpacing !== newState.letterSpacing || oldState.lines !== newState.lines || oldState.rowHeight !== newState.rowHeight || oldState.tabSize !== newState.tabSize || oldState.width !== newState.width);
+  return oldState.diagnostics !== newState.diagnostics || (newState.diagnostics?.length ?? 0) > 0 && (oldState.deltaX !== newState.deltaX || oldState.minLineY !== newState.minLineY || oldState.charWidth !== newState.charWidth || oldState.fontFamily !== newState.fontFamily || oldState.fontSize !== newState.fontSize || oldState.fontWeight !== newState.fontWeight || oldState.isMonospaceFont !== newState.isMonospaceFont || oldState.letterSpacing !== newState.letterSpacing || oldState.lines !== newState.lines || oldState.rowHeight !== newState.rowHeight || oldState.tabSize !== newState.tabSize || oldState.width !== newState.width);
 };
 const shouldUpdateSelectionData = (oldState, newState) => {
-  return oldState.selections !== newState.selections || oldState.focused !== newState.focused || oldState.minLineY !== newState.minLineY || oldState.maxLineY !== newState.maxLineY || oldState.visibleViewLineIndices !== newState.visibleViewLineIndices || oldState.foldingRanges !== newState.foldingRanges || oldState.differences !== newState.differences || oldState.charWidth !== newState.charWidth || oldState.cursorWidth !== newState.cursorWidth || oldState.fontFamily !== newState.fontFamily || oldState.fontSize !== newState.fontSize || oldState.fontWeight !== newState.fontWeight || oldState.isMonospaceFont !== newState.isMonospaceFont || oldState.letterSpacing !== newState.letterSpacing || oldState.lines !== newState.lines || oldState.rowHeight !== newState.rowHeight || oldState.tabSize !== newState.tabSize || oldState.width !== newState.width;
+  return oldState.selections !== newState.selections || oldState.focused !== newState.focused || oldState.deltaX !== newState.deltaX || oldState.minLineY !== newState.minLineY || oldState.maxLineY !== newState.maxLineY || oldState.visibleViewLineIndices !== newState.visibleViewLineIndices || oldState.foldingRanges !== newState.foldingRanges || oldState.differences !== newState.differences || oldState.charWidth !== newState.charWidth || oldState.cursorWidth !== newState.cursorWidth || oldState.fontFamily !== newState.fontFamily || oldState.fontSize !== newState.fontSize || oldState.fontWeight !== newState.fontWeight || oldState.isMonospaceFont !== newState.isMonospaceFont || oldState.letterSpacing !== newState.letterSpacing || oldState.lines !== newState.lines || oldState.rowHeight !== newState.rowHeight || oldState.tabSize !== newState.tabSize || oldState.width !== newState.width;
 };
 const shouldUpdateBracketMatchData = (oldState, newState) => {
   if (!('bracketMatchInfos' in newState)) {

package/package.json

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