@lvce-editor/editor-worker 19.78.13 → 19.78.15

package/dist/diff-sdk.js

@@ -2823,6 +2823,14 @@ const getTokensViewport = (editor, startLineIndex, endLineIndex) => {
   };
 };
 
+const isDefaultPlainText = editor => {
+  const tokenizePath = getTokenizePath$1(editor.languageId);
+  // The bundled plaintext extension has the same state-free Text token as the
+  // fallback. Only its exact application asset URI may bypass the worker.
+  const builtinPath = editor.assetDir ? `${editor.assetDir}/extensions/builtin.language-basics-plaintext/src/tokenizePlaintext.js` : undefined;
+  return editor.languageId === 'plaintext' && (!tokenizePath || tokenizePath === builtinPath) && get$6(editor.tokenizerId) === TokenizePlainText;
+};
+
 const normalizeLine = line => {
   if (line.startsWith('Error: ')) {
     return line.slice('Error: '.length);
@@ -10854,6 +10862,20 @@ const getTokensViewport2 = async (editor, start, end, syncIncremental) => {
       tokens: []
     };
   }
+  if (isDefaultPlainText(editor)) {
+    // Plain text has no continuation state. If a contributed tokenizer is loaded
+    // later, it must receive all lines and rebuild its own state from the start.
+    editor.invalidStartIndex = 0;
+    editor.lineCache = [];
+    if (editor.lifecycle) {
+      delete editor.lifecycle.sentLines;
+    }
+    return {
+      embeddedResults: [],
+      tokenizersToLoad: [],
+      tokens: editor.lines.slice(start, end).map(line => tokenizeLine(line, initialLineState))
+    };
+  }
   // Preserve the original request/disposal ordering when caching is disabled.
   if (editor.syntaxHighlightingCacheEnabled !== true) {
     return getFreshTokensViewport(editor, start, end, syncIncremental);
@@ -11708,6 +11730,15 @@ const getIncrementalEdits = async (oldState, newState) => {
       if (newState.deltaX !== 0 || oldLine.length > threshold || newLine.length > threshold) {
         return emptyIncrementalEdits;
       }
+      if (isDefaultPlainText(newState)) {
+        // Match the worker's single Text-token edit, keeping visible-text work
+        // in the same phase as syntax-worker incremental responses.
+        return oldLine.length === newLine.length ? emptyIncrementalEdits : [{
+          columnIndex: 0,
+          rowIndex: rowIndex - newState.minLineY,
+          text: newLine
+        }];
+      }
       // @ts-ignore
       const incrementalEdits = await invoke$c(
       // @ts-ignore
@@ -15046,7 +15077,7 @@ const isEqual$5 = (oldState, newState) => {
 };
 
 const isEqual$4 = (oldState, newState) => {
-  return oldState.rowHeight === newState.rowHeight && oldState.textDecorations === newState.textDecorations && oldState.deltaY === newState.deltaY && oldState.finalDeltaY === newState.finalDeltaY && oldState.height === newState.height && oldState.deltaX === newState.deltaX && oldState.gutterWidth === newState.gutterWidth && oldState.longestLineWidth === newState.longestLineWidth && oldState.minimumSliderSize === newState.minimumSliderSize && oldState.width === newState.width && oldState.scrollBarHeight === newState.scrollBarHeight;
+  return oldState.rowHeight === newState.rowHeight && oldState.textDecorations === newState.textDecorations && oldState.deltaY === newState.deltaY && oldState.finalDeltaY === newState.finalDeltaY && oldState.height === newState.height && oldState.gutterWidth === newState.gutterWidth && oldState.scrollBarHeight === newState.scrollBarHeight;
 };
 
 const isEqual$3 = (oldState, newState) => {
@@ -15063,7 +15094,7 @@ const isEqual$3 = (oldState, newState) => {
 };
 
 const isEqual$2 = (oldState, newState) => {
-  return oldState.textDecorationDom === newState.textDecorationDom && oldState.breadcrumbFileIcon === newState.breadcrumbFileIcon && oldState.breadcrumbsEnabled === newState.breadcrumbsEnabled && oldState.breakPoints === newState.breakPoints && oldState.bracketMatchInfos === newState.bracketMatchInfos && oldState.cursorInfos === newState.cursorInfos && oldState.diagnostics === newState.diagnostics && oldState.documentSymbols === newState.documentSymbols && oldState.endOfLineDecorations === newState.endOfLineDecorations && oldState.focused === newState.focused && oldState.gutterDecorations === newState.gutterDecorations && oldState.highlightActiveLineNumber === newState.highlightActiveLineNumber && oldState.highlightedLine === newState.highlightedLine && oldState.problemsHighlightedRow === newState.problemsHighlightedRow && oldState.lineNumbers === newState.lineNumbers && oldState.loadError === newState.loadError && oldState.textInfos === newState.textInfos && oldState.visibleViewLineIndices === newState.visibleViewLineIndices && oldState.differences === newState.differences && oldState.initial === newState.initial && oldState.scrollBarHeight === newState.scrollBarHeight && oldState.width === newState.width && oldState.gutterWidth === newState.gutterWidth && oldState.longestLineWidth === newState.longestLineWidth && oldState.minimumSliderSize === newState.minimumSliderSize && oldState.selectionInfos === newState.selectionInfos && oldState.selections === newState.selections && oldState.workspaceUri === newState.workspaceUri;
+  return oldState.textDecorationDom === newState.textDecorationDom && oldState.breadcrumbFileIcon === newState.breadcrumbFileIcon && oldState.breadcrumbsEnabled === newState.breadcrumbsEnabled && oldState.breakPoints === newState.breakPoints && oldState.bracketMatchInfos === newState.bracketMatchInfos && oldState.cursorInfos === newState.cursorInfos && oldState.diagnostics === newState.diagnostics && oldState.documentSymbols === newState.documentSymbols && oldState.endOfLineDecorations === newState.endOfLineDecorations && oldState.focused === newState.focused && oldState.gutterDecorations === newState.gutterDecorations && oldState.highlightActiveLineNumber === newState.highlightActiveLineNumber && oldState.highlightedLine === newState.highlightedLine && oldState.problemsHighlightedRow === newState.problemsHighlightedRow && oldState.lineNumbers === newState.lineNumbers && oldState.loadError === newState.loadError && oldState.textInfos === newState.textInfos && oldState.visibleViewLineIndices === newState.visibleViewLineIndices && oldState.differences === newState.differences && oldState.initial === newState.initial && oldState.scrollBarHeight === newState.scrollBarHeight && oldState.deltaX === newState.deltaX && oldState.width === newState.width && oldState.gutterWidth === newState.gutterWidth && oldState.longestLineWidth === newState.longestLineWidth && oldState.minimumSliderSize === newState.minimumSliderSize && oldState.selectionInfos === newState.selectionInfos && oldState.selections === newState.selections && oldState.workspaceUri === newState.workspaceUri;
 };
 
 const isEqual$1 = (oldState, newState) => {
@@ -15652,8 +15683,8 @@ const {
   setFactory
 } = createLazyRpc(RpcId.CompletionWorker);
 
-// These commits preserve the document, selection, layout, widgets and lifecycle.
-const diagnosticFields = new Set(['decorations', 'diagnostics', 'lightBulbRowIndex', 'visualDecorations']);
+// Diagnostic updates and undo grouping preserve the document, selection, layout, widgets and lifecycle.
+const independentFields = new Set(['canCoalesceTyping', 'decorations', 'diagnostics', 'lightBulbRowIndex', 'visualDecorations']);
 const isCurrent$1 = (snapshot, current) => {
   if (!current || current.lifecycle?.disposed) {
     return false;
@@ -15663,7 +15694,7 @@ const isCurrent$1 = (snapshot, current) => {
   }
   const keys = new Set([...Object.keys(snapshot), ...Object.keys(current)]);
   for (const key of keys) {
-    if (diagnosticFields.has(key)) {
+    if (independentFields.has(key)) {
       continue;
     }
     const field = key;
@@ -15682,6 +15713,7 @@ const merge = (current, snapshot, result) => {
   }
   return {
     ...result,
+    canCoalesceTyping: current.canCoalesceTyping ?? false,
     decorations: current.decorations,
     diagnostics: current.diagnostics,
     lightBulbRowIndex: current.lightBulbRowIndex,
@@ -24669,28 +24701,31 @@ ${editorSelector} .ScrollBarThumbHorizontal {
 `;
 };
 
-const renderCss$1 = (oldState, newState) => {
+const renderCss$1 = (oldState, newState, horizontalThumbInDom = true) => {
   const {
-    deltaX,
     deltaY,
     finalDeltaY,
     gutterWidth,
     height,
-    longestLineWidth,
-    minimumSliderSize,
     rowHeight,
     scrollBarHeight,
     uid
   } = newState;
-  const {
-    width
-  } = getHorizontalScrollDimensions(newState);
   const scrollBarTop = getScrollBarY(deltaY, finalDeltaY, height, scrollBarHeight);
-  const scrollBarWidth = getScrollBarSize(width, longestLineWidth, minimumSliderSize);
-  const scrollBarLeft = getScrollBarOffset(deltaX, Math.max(0, longestLineWidth - width), width, scrollBarWidth);
+  let scrollBarWidth = 0;
+  let scrollBarLeft = 0;
+  if (!horizontalThumbInDom) {
+    const {
+      width
+    } = getHorizontalScrollDimensions(newState);
+    scrollBarWidth = getScrollBarSize(width, newState.longestLineWidth, newState.minimumSliderSize);
+    scrollBarLeft = getScrollBarOffset(newState.deltaX, Math.max(0, newState.longestLineWidth - width), width, scrollBarWidth);
+  }
   const decorationCss = (newState.textDecorations || []).map(({
     color
   }, index) => `.Editor[data-uid="${uid}"] .EditorTextDecoration${index} { background-color: ${color}; }`).join('\n');
+  // Horizontal thumb geometry is patched on the thumb itself. Keep the
+  // editor stylesheet stable while typing into an overflowing line.
   const css = decorationCss + getCss(uid, rowHeight, scrollBarHeight, scrollBarTop, scrollBarWidth, scrollBarLeft, deltaY);
   return [SetCss$1, uid, gutterWidth ? `${css}\n.Editor[data-uid="${uid}"] .Gutter { width: ${gutterWidth}px; }\n` : css];
 };
@@ -25364,7 +25399,7 @@ const horizontalScrollBarThumbNode = {
   className: mergeClassNames('ScrollBarThumb', 'ScrollBarThumbHorizontal'),
   type: Div
 };
-const getScrollBarVirtualDom = (scrollBarHeight, scrollBarWidth) => {
+const getScrollBarVirtualDom = (scrollBarHeight, scrollBarWidth, scrollBarLeft = 0) => {
   const hasVerticalThumb = scrollBarHeight > 0;
   const hasHorizontalThumb = scrollBarWidth > 0;
   return [{
@@ -25373,7 +25408,10 @@ const getScrollBarVirtualDom = (scrollBarHeight, scrollBarWidth) => {
   }, ...(hasVerticalThumb ? [verticalScrollBarThumbNode] : []), {
     ...horizontalScrollBarNode,
     childCount: hasHorizontalThumb ? 1 : 0
-  }, ...(hasHorizontalThumb ? [horizontalScrollBarThumbNode] : [])];
+  }, ...(hasHorizontalThumb ? [{
+    ...horizontalScrollBarThumbNode,
+    style: `width:${scrollBarWidth}px;translate:${scrollBarLeft}px 0px`
+  }] : [])];
 };
 
 const editorContentNode = {
@@ -25401,6 +25439,7 @@ const getEditorContentVirtualDom = ({
   rtl = false,
   scrollBarDiagnostics = [],
   scrollBarHeight = 0,
+  scrollBarLeft = 0,
   scrollBarWidth = 0,
   selectionInfos = [],
   tabSize = 2,
@@ -25413,7 +25452,7 @@ const getEditorContentVirtualDom = ({
   return [{
     ...editorContentNode,
     className: breadcrumbsEnabled ? 'EditorContent EditorBreadcrumbsOffset' : 'EditorContent'
-  }, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics, visibleLineIndices, endOfLineDecorations, bracketMatchInfos, focused, visibleViewLineIndices, problemsHighlightedRow, roundedSelection, unnecessaryDiagnostics, horizontalVisibleRanges, lines, tabSize, textDecorationDom, rtl), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom(scrollBarHeight, scrollBarWidth)];
+  }, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics, visibleLineIndices, endOfLineDecorations, bracketMatchInfos, focused, visibleViewLineIndices, problemsHighlightedRow, roundedSelection, unnecessaryDiagnostics, horizontalVisibleRanges, lines, tabSize, textDecorationDom, rtl), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom(scrollBarHeight, scrollBarWidth, scrollBarLeft)];
 };
 
 const getGutterInfoVirtualDom = (gutterInfo, activeLineNumber) => {
@@ -25597,6 +25636,7 @@ const getEditorVirtualDom = ({
 }, {
   diagnostics = fallbackDiagnostics,
   scrollBarDiagnostics = fallbackScrollBarDiagnostics,
+  scrollBarLeft = 0,
   scrollBarWidth = fallbackScrollBarWidth,
   unnecessaryDiagnostics = fallbackUnnecessaryDiagnostics
 } = {}) => {
@@ -25652,6 +25692,7 @@ const getEditorVirtualDom = ({
     rtl,
     scrollBarDiagnostics,
     scrollBarHeight,
+    scrollBarLeft,
     scrollBarWidth,
     selectionInfos,
     tabSize,
@@ -25763,7 +25804,7 @@ const canRenderPlainTextAppend = (oldState, newState) => {
   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.textDecorationDom) || !isEmpty(newState.textDecorationDom) || !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)) {
+  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.deltaX !== newState.deltaX || oldState.gutterWidth !== newState.gutterWidth || (newState.deltaX ?? 0) !== 0 && oldState.longestLineWidth !== newState.longestLineWidth || oldState.width !== newState.width || oldState.height !== newState.height || oldState.minimumSliderSize !== newState.minimumSliderSize || getScrollBarSize(getHorizontalScrollDimensions(oldState).width, oldState.longestLineWidth, oldState.minimumSliderSize) !== getScrollBarSize(getHorizontalScrollDimensions(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.textDecorationDom) || !isEmpty(newState.textDecorationDom) || !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;
@@ -25821,6 +25862,7 @@ const updateTextAppendDom = (oldDom, state, paths) => {
 
 const getDom = state => {
   const {
+    deltaX = 0,
     diagnostics = [],
     initial,
     longestLineWidth,
@@ -25834,10 +25876,13 @@ const getDom = state => {
   const {
     width
   } = getHorizontalScrollDimensions(state);
+  const scrollBarWidth = getScrollBarSize(width, longestLineWidth, minimumSliderSize);
+  const scrollBarLeft = getScrollBarOffset(deltaX, Math.max(0, longestLineWidth - width), width, scrollBarWidth);
   return getEditorVirtualDom(state, {
     diagnostics: visualDecorations,
     scrollBarDiagnostics: getScrollBarDiagnostics(state, diagnostics),
-    scrollBarWidth: getScrollBarSize(width, longestLineWidth, minimumSliderSize),
+    scrollBarLeft,
+    scrollBarWidth,
     unnecessaryDiagnostics: diagnostics
   });
 };
@@ -28028,8 +28073,8 @@ const renderSelections = {
   isEqual: (oldState, newState) => oldState.cursorInfos === newState.cursorInfos && oldState.selectionInfos === newState.selectionInfos && oldState.focused === newState.focused && oldState.roundedSelection === newState.roundedSelection
 };
 const renderCss = {
-  apply: renderCss$1,
-  isEqual: isEqual$4
+  apply: (oldState, newState) => renderCss$1(oldState, newState, false),
+  isEqual: (oldState, newState) => isEqual$4(oldState, newState) && oldState.deltaX === newState.deltaX && oldState.longestLineWidth === newState.longestLineWidth && oldState.minimumSliderSize === newState.minimumSliderSize && oldState.width === newState.width
 };
 const renderFocus$1 = {
   apply: (oldState, newState) => [/* method */'setFocused', newState.focused],

package/dist/editorWorkerMain.js

@@ -4224,6 +4224,14 @@ const getTokensViewport = (editor, startLineIndex, endLineIndex) => {
   };
 };
 
+const isDefaultPlainText = editor => {
+  const tokenizePath = getTokenizePath$1(editor.languageId);
+  // The bundled plaintext extension has the same state-free Text token as the
+  // fallback. Only its exact application asset URI may bypass the worker.
+  const builtinPath = editor.assetDir ? `${editor.assetDir}/extensions/builtin.language-basics-plaintext/src/tokenizePlaintext.js` : undefined;
+  return editor.languageId === 'plaintext' && (!tokenizePath || tokenizePath === builtinPath) && get$5(editor.tokenizerId) === TokenizePlainText;
+};
+
 const state$c = {};
 const create$a = () => create$g({
   commandMap: {},
@@ -11314,6 +11322,20 @@ const getTokensViewport2 = async (editor, start, end, syncIncremental) => {
       tokens: []
     };
   }
+  if (isDefaultPlainText(editor)) {
+    // Plain text has no continuation state. If a contributed tokenizer is loaded
+    // later, it must receive all lines and rebuild its own state from the start.
+    editor.invalidStartIndex = 0;
+    editor.lineCache = [];
+    if (editor.lifecycle) {
+      delete editor.lifecycle.sentLines;
+    }
+    return {
+      embeddedResults: [],
+      tokenizersToLoad: [],
+      tokens: editor.lines.slice(start, end).map(line => tokenizeLine(line, initialLineState))
+    };
+  }
   // Preserve the original request/disposal ordering when caching is disabled.
   if (editor.syntaxHighlightingCacheEnabled !== true) {
     return getFreshTokensViewport(editor, start, end, syncIncremental);
@@ -12168,6 +12190,15 @@ const getIncrementalEdits = async (oldState, newState) => {
       if (newState.deltaX !== 0 || oldLine.length > threshold || newLine.length > threshold) {
         return emptyIncrementalEdits;
       }
+      if (isDefaultPlainText(newState)) {
+        // Match the worker's single Text-token edit, keeping visible-text work
+        // in the same phase as syntax-worker incremental responses.
+        return oldLine.length === newLine.length ? emptyIncrementalEdits : [{
+          columnIndex: 0,
+          rowIndex: rowIndex - newState.minLineY,
+          text: newLine
+        }];
+      }
       // @ts-ignore
       const incrementalEdits = await invoke$c(
       // @ts-ignore
@@ -15506,7 +15537,7 @@ const isEqual$5 = (oldState, newState) => {
 };
 
 const isEqual$4 = (oldState, newState) => {
-  return oldState.rowHeight === newState.rowHeight && oldState.textDecorations === newState.textDecorations && oldState.deltaY === newState.deltaY && oldState.finalDeltaY === newState.finalDeltaY && oldState.height === newState.height && oldState.deltaX === newState.deltaX && oldState.gutterWidth === newState.gutterWidth && oldState.longestLineWidth === newState.longestLineWidth && oldState.minimumSliderSize === newState.minimumSliderSize && oldState.width === newState.width && oldState.scrollBarHeight === newState.scrollBarHeight;
+  return oldState.rowHeight === newState.rowHeight && oldState.textDecorations === newState.textDecorations && oldState.deltaY === newState.deltaY && oldState.finalDeltaY === newState.finalDeltaY && oldState.height === newState.height && oldState.gutterWidth === newState.gutterWidth && oldState.scrollBarHeight === newState.scrollBarHeight;
 };
 
 const isEqual$3 = (oldState, newState) => {
@@ -15523,7 +15554,7 @@ const isEqual$3 = (oldState, newState) => {
 };
 
 const isEqual$2 = (oldState, newState) => {
-  return oldState.textDecorationDom === newState.textDecorationDom && oldState.breadcrumbFileIcon === newState.breadcrumbFileIcon && oldState.breadcrumbsEnabled === newState.breadcrumbsEnabled && oldState.breakPoints === newState.breakPoints && oldState.bracketMatchInfos === newState.bracketMatchInfos && oldState.cursorInfos === newState.cursorInfos && oldState.diagnostics === newState.diagnostics && oldState.documentSymbols === newState.documentSymbols && oldState.endOfLineDecorations === newState.endOfLineDecorations && oldState.focused === newState.focused && oldState.gutterDecorations === newState.gutterDecorations && oldState.highlightActiveLineNumber === newState.highlightActiveLineNumber && oldState.highlightedLine === newState.highlightedLine && oldState.problemsHighlightedRow === newState.problemsHighlightedRow && oldState.lineNumbers === newState.lineNumbers && oldState.loadError === newState.loadError && oldState.textInfos === newState.textInfos && oldState.visibleViewLineIndices === newState.visibleViewLineIndices && oldState.differences === newState.differences && oldState.initial === newState.initial && oldState.scrollBarHeight === newState.scrollBarHeight && oldState.width === newState.width && oldState.gutterWidth === newState.gutterWidth && oldState.longestLineWidth === newState.longestLineWidth && oldState.minimumSliderSize === newState.minimumSliderSize && oldState.selectionInfos === newState.selectionInfos && oldState.selections === newState.selections && oldState.workspaceUri === newState.workspaceUri;
+  return oldState.textDecorationDom === newState.textDecorationDom && oldState.breadcrumbFileIcon === newState.breadcrumbFileIcon && oldState.breadcrumbsEnabled === newState.breadcrumbsEnabled && oldState.breakPoints === newState.breakPoints && oldState.bracketMatchInfos === newState.bracketMatchInfos && oldState.cursorInfos === newState.cursorInfos && oldState.diagnostics === newState.diagnostics && oldState.documentSymbols === newState.documentSymbols && oldState.endOfLineDecorations === newState.endOfLineDecorations && oldState.focused === newState.focused && oldState.gutterDecorations === newState.gutterDecorations && oldState.highlightActiveLineNumber === newState.highlightActiveLineNumber && oldState.highlightedLine === newState.highlightedLine && oldState.problemsHighlightedRow === newState.problemsHighlightedRow && oldState.lineNumbers === newState.lineNumbers && oldState.loadError === newState.loadError && oldState.textInfos === newState.textInfos && oldState.visibleViewLineIndices === newState.visibleViewLineIndices && oldState.differences === newState.differences && oldState.initial === newState.initial && oldState.scrollBarHeight === newState.scrollBarHeight && oldState.deltaX === newState.deltaX && oldState.width === newState.width && oldState.gutterWidth === newState.gutterWidth && oldState.longestLineWidth === newState.longestLineWidth && oldState.minimumSliderSize === newState.minimumSliderSize && oldState.selectionInfos === newState.selectionInfos && oldState.selections === newState.selections && oldState.workspaceUri === newState.workspaceUri;
 };
 
 const isEqual$1 = (oldState, newState) => {
@@ -16112,8 +16143,8 @@ const {
   setFactory
 } = createLazyRpc(CompletionWorker);
 
-// These commits preserve the document, selection, layout, widgets and lifecycle.
-const diagnosticFields = new Set(['decorations', 'diagnostics', 'lightBulbRowIndex', 'visualDecorations']);
+// Diagnostic updates and undo grouping preserve the document, selection, layout, widgets and lifecycle.
+const independentFields = new Set(['canCoalesceTyping', 'decorations', 'diagnostics', 'lightBulbRowIndex', 'visualDecorations']);
 const isCurrent$1 = (snapshot, current) => {
   if (!current || current.lifecycle?.disposed) {
     return false;
@@ -16123,7 +16154,7 @@ const isCurrent$1 = (snapshot, current) => {
   }
   const keys = new Set([...Object.keys(snapshot), ...Object.keys(current)]);
   for (const key of keys) {
-    if (diagnosticFields.has(key)) {
+    if (independentFields.has(key)) {
       continue;
     }
     const field = key;
@@ -16142,6 +16173,7 @@ const merge = (current, snapshot, result) => {
   }
   return {
     ...result,
+    canCoalesceTyping: current.canCoalesceTyping ?? false,
     decorations: current.decorations,
     diagnostics: current.diagnostics,
     lightBulbRowIndex: current.lightBulbRowIndex,
@@ -25120,28 +25152,31 @@ ${editorSelector} .ScrollBarThumbHorizontal {
 `;
 };
 
-const renderCss$1 = (oldState, newState) => {
+const renderCss$1 = (oldState, newState, horizontalThumbInDom = true) => {
   const {
-    deltaX,
     deltaY,
     finalDeltaY,
     gutterWidth,
     height,
-    longestLineWidth,
-    minimumSliderSize,
     rowHeight,
     scrollBarHeight,
     uid
   } = newState;
-  const {
-    width
-  } = getHorizontalScrollDimensions(newState);
   const scrollBarTop = getScrollBarY(deltaY, finalDeltaY, height, scrollBarHeight);
-  const scrollBarWidth = getScrollBarSize(width, longestLineWidth, minimumSliderSize);
-  const scrollBarLeft = getScrollBarOffset(deltaX, Math.max(0, longestLineWidth - width), width, scrollBarWidth);
+  let scrollBarWidth = 0;
+  let scrollBarLeft = 0;
+  if (!horizontalThumbInDom) {
+    const {
+      width
+    } = getHorizontalScrollDimensions(newState);
+    scrollBarWidth = getScrollBarSize(width, newState.longestLineWidth, newState.minimumSliderSize);
+    scrollBarLeft = getScrollBarOffset(newState.deltaX, Math.max(0, newState.longestLineWidth - width), width, scrollBarWidth);
+  }
   const decorationCss = (newState.textDecorations || []).map(({
     color
   }, index) => `.Editor[data-uid="${uid}"] .EditorTextDecoration${index} { background-color: ${color}; }`).join('\n');
+  // Horizontal thumb geometry is patched on the thumb itself. Keep the
+  // editor stylesheet stable while typing into an overflowing line.
   const css = decorationCss + getCss(uid, rowHeight, scrollBarHeight, scrollBarTop, scrollBarWidth, scrollBarLeft, deltaY);
   return [SetCss$1, uid, gutterWidth ? `${css}\n.Editor[data-uid="${uid}"] .Gutter { width: ${gutterWidth}px; }\n` : css];
 };
@@ -25815,7 +25850,7 @@ const horizontalScrollBarThumbNode = {
   className: mergeClassNames('ScrollBarThumb', 'ScrollBarThumbHorizontal'),
   type: Div
 };
-const getScrollBarVirtualDom = (scrollBarHeight, scrollBarWidth) => {
+const getScrollBarVirtualDom = (scrollBarHeight, scrollBarWidth, scrollBarLeft = 0) => {
   const hasVerticalThumb = scrollBarHeight > 0;
   const hasHorizontalThumb = scrollBarWidth > 0;
   return [{
@@ -25824,7 +25859,10 @@ const getScrollBarVirtualDom = (scrollBarHeight, scrollBarWidth) => {
   }, ...(hasVerticalThumb ? [verticalScrollBarThumbNode] : []), {
     ...horizontalScrollBarNode,
     childCount: hasHorizontalThumb ? 1 : 0
-  }, ...(hasHorizontalThumb ? [horizontalScrollBarThumbNode] : [])];
+  }, ...(hasHorizontalThumb ? [{
+    ...horizontalScrollBarThumbNode,
+    style: `width:${scrollBarWidth}px;translate:${scrollBarLeft}px 0px`
+  }] : [])];
 };
 
 const editorContentNode = {
@@ -25852,6 +25890,7 @@ const getEditorContentVirtualDom = ({
   rtl = false,
   scrollBarDiagnostics = [],
   scrollBarHeight = 0,
+  scrollBarLeft = 0,
   scrollBarWidth = 0,
   selectionInfos = [],
   tabSize = 2,
@@ -25864,7 +25903,7 @@ const getEditorContentVirtualDom = ({
   return [{
     ...editorContentNode,
     className: breadcrumbsEnabled ? 'EditorContent EditorBreadcrumbsOffset' : 'EditorContent'
-  }, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics, visibleLineIndices, endOfLineDecorations, bracketMatchInfos, focused, visibleViewLineIndices, problemsHighlightedRow, roundedSelection, unnecessaryDiagnostics, horizontalVisibleRanges, lines, tabSize, textDecorationDom, rtl), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom(scrollBarHeight, scrollBarWidth)];
+  }, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics, visibleLineIndices, endOfLineDecorations, bracketMatchInfos, focused, visibleViewLineIndices, problemsHighlightedRow, roundedSelection, unnecessaryDiagnostics, horizontalVisibleRanges, lines, tabSize, textDecorationDom, rtl), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom(scrollBarHeight, scrollBarWidth, scrollBarLeft)];
 };
 
 const getGutterInfoVirtualDom = (gutterInfo, activeLineNumber) => {
@@ -26048,6 +26087,7 @@ const getEditorVirtualDom = ({
 }, {
   diagnostics = fallbackDiagnostics,
   scrollBarDiagnostics = fallbackScrollBarDiagnostics,
+  scrollBarLeft = 0,
   scrollBarWidth = fallbackScrollBarWidth,
   unnecessaryDiagnostics = fallbackUnnecessaryDiagnostics
 } = {}) => {
@@ -26103,6 +26143,7 @@ const getEditorVirtualDom = ({
     rtl,
     scrollBarDiagnostics,
     scrollBarHeight,
+    scrollBarLeft,
     scrollBarWidth,
     selectionInfos,
     tabSize,
@@ -26214,7 +26255,7 @@ const canRenderPlainTextAppend = (oldState, newState) => {
   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.textDecorationDom) || !isEmpty(newState.textDecorationDom) || !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)) {
+  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.deltaX !== newState.deltaX || oldState.gutterWidth !== newState.gutterWidth || (newState.deltaX ?? 0) !== 0 && oldState.longestLineWidth !== newState.longestLineWidth || oldState.width !== newState.width || oldState.height !== newState.height || oldState.minimumSliderSize !== newState.minimumSliderSize || getScrollBarSize(getHorizontalScrollDimensions(oldState).width, oldState.longestLineWidth, oldState.minimumSliderSize) !== getScrollBarSize(getHorizontalScrollDimensions(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.textDecorationDom) || !isEmpty(newState.textDecorationDom) || !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;
@@ -26272,6 +26313,7 @@ const updateTextAppendDom = (oldDom, state, paths) => {
 
 const getDom = state => {
   const {
+    deltaX = 0,
     diagnostics = [],
     initial,
     longestLineWidth,
@@ -26285,10 +26327,13 @@ const getDom = state => {
   const {
     width
   } = getHorizontalScrollDimensions(state);
+  const scrollBarWidth = getScrollBarSize(width, longestLineWidth, minimumSliderSize);
+  const scrollBarLeft = getScrollBarOffset(deltaX, Math.max(0, longestLineWidth - width), width, scrollBarWidth);
   return getEditorVirtualDom(state, {
     diagnostics: visualDecorations,
     scrollBarDiagnostics: getScrollBarDiagnostics(state, diagnostics),
-    scrollBarWidth: getScrollBarSize(width, longestLineWidth, minimumSliderSize),
+    scrollBarLeft,
+    scrollBarWidth,
     unnecessaryDiagnostics: diagnostics
   });
 };
@@ -28479,8 +28524,8 @@ const renderSelections = {
   isEqual: (oldState, newState) => oldState.cursorInfos === newState.cursorInfos && oldState.selectionInfos === newState.selectionInfos && oldState.focused === newState.focused && oldState.roundedSelection === newState.roundedSelection
 };
 const renderCss = {
-  apply: renderCss$1,
-  isEqual: isEqual$4
+  apply: (oldState, newState) => renderCss$1(oldState, newState, false),
+  isEqual: (oldState, newState) => isEqual$4(oldState, newState) && oldState.deltaX === newState.deltaX && oldState.longestLineWidth === newState.longestLineWidth && oldState.minimumSliderSize === newState.minimumSliderSize && oldState.width === newState.width
 };
 const renderFocus$1 = {
   apply: (oldState, newState) => [/* method */'setFocused', newState.focused],

package/package.json

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