@lvce-editor/editor-worker 19.60.3 → 19.61.1

package/README.md

@@ -41,7 +41,7 @@ Install dependencies from the repository root:
 npm ci
 ```
 
-The root `postinstall` script bootstraps the packages with Lerna.
+Installation does not modify the installed server assets.
 
 Start a development build and local test server:
 
@@ -49,7 +49,7 @@ Start a development build and local test server:
 npm run dev
 ```
 
-This starts the editor worker watch build and the Lvce Editor test server with `packages/e2e` as the test path.
+This builds the local package, then starts the watch build and the Lvce Editor test server with `packages/e2e` as the test path. The server uses `--link` to load the generated `.tmp/dist` editor-worker package.
 
 ## Common Commands
 
@@ -61,7 +61,7 @@ Run these commands from the repository root unless noted otherwise.
 | `npm run build:watch`  | Watches `packages/editor-worker/src/editorWorkerMain.ts` and rebuilds the worker with esbuild.                         |
 | `npm run build:static` | Exports a static test build into `.tmp/static`. Run `npm run build` first.                                             |
 | `npm run dev`          | Runs the watch build and local test server together.                                                                   |
-| `npm test`             | Runs package test scripts through Lerna.                                                                               |
+| `npm test`             | Runs package test scripts through npm workspaces.                                                                      |
 | `npm run type-check`   | Runs TypeScript project references for all packages.                                                                   |
 | `npm run lint`         | Runs ESLint, Prettier checks, and Knip.                                                                                |
 | `npm run format`       | Formats the repository with Prettier.                                                                                  |
@@ -107,7 +107,7 @@ The worker listens for RPC messages, registers widget modules, initializes unhan
 
 Unit tests live in `packages/editor-worker/test` and are run by the editor-worker package's Jest setup.
 
-End-to-end tests live in `packages/e2e/src` and use fixture extensions from `packages/e2e/fixtures`. Before running e2e tests locally, install Chromium if needed:
+End-to-end tests live in `packages/e2e/src` and use fixture extensions from `packages/e2e/fixtures`. Run `npm run build` from the repository root before launching either e2e suite: both server launchers link the local `.tmp/dist` package. Install Chromium if needed:
 
 ```sh
 cd packages/e2e
@@ -115,6 +115,8 @@ npx playwright install chromium
 npm run e2e:headless
 ```
 
+The memory benchmark pins its Playwright version in `packages/build` to keep the browser runtime consistent with the memory limit. E2e tests use the browser version required by the test harness.
+
 ## CI and Releases
 
 Pull requests and pushes to `main` run on Ubuntu, macOS, and Windows. CI builds the worker, exports the static test build, runs unit tests, type checks, linting, e2e tests, and memory measurement.

package/dist/editorWorkerMain.js

@@ -669,6 +669,9 @@ const restoreExistingError = (error, currentStack) => {
 };
 const restoreMethodNotFoundError = (error, currentStack) => {
   const restoredError = new JsonRpcError(error.message);
+  Object.assign(restoredError, {
+    code: error.code
+  });
   const parentStack = getParentStack(error);
   setStack(restoredError, `${parentStack}${NewLine$1}${currentStack}`);
   return restoredError;
@@ -688,9 +691,13 @@ const applyDataProperties = (restoredError, error) => {
     // @ts-ignore
     restoredError.codeFrame = error.data.codeFrame;
   }
-  if (error.data.code) {
+  if (typeof error.data.code === 'string' || typeof error.data.code === 'number') {
     // @ts-ignore
-    restoredError.code = error.data.code;
+    Object.defineProperty(restoredError, 'code', {
+      configurable: true,
+      value: error.data.code,
+      writable: true
+    });
   }
   if (error.data.type) {
     // @ts-ignore
@@ -712,6 +719,13 @@ const applyDirectProperties = (restoredError, error) => {
 };
 const restoreMessageError = (error, _currentStack) => {
   const restoredError = constructError(error.message, error.type, error.name);
+  if (typeof error.code === 'string' || typeof error.code === 'number') {
+    Object.defineProperty(restoredError, 'code', {
+      configurable: true,
+      value: error.code,
+      writable: true
+    });
+  }
   if (error.data) {
     applyDataProperties(restoredError, error);
   } else {
@@ -790,7 +804,7 @@ const getErrorProperty = (error, prettyError) => {
   return {
     code: Custom,
     data: {
-      code: prettyError.code,
+      code: prettyError.code ?? error?.code,
       codeFrame: prettyError.codeFrame,
       name: prettyError.name,
       stack: getStack(prettyError),
@@ -827,7 +841,12 @@ const getErrorResponseSimple = (id, error) => {
   return {
     error: {
       code: Custom,
-      data: error,
+      data: error instanceof Error ? {
+        ...error,
+        code: 'code' in error ? error.code : undefined,
+        stack: error.stack,
+        type: error.name
+      } : error,
       // @ts-ignore
       message: error.message
     },
@@ -1262,7 +1281,7 @@ const CtrlCmd = 1 << 11 >>> 0;
 const Shift = 1 << 10 >>> 0;
 const Alt$1 = 1 << 9 >>> 0;
 
-const Editor$1 = 3;
+const Editor$2 = 3;
 const SourceControl = 22;
 
 const Separator = 1;
@@ -1277,10 +1296,10 @@ const DragAndDropWorker = 3404;
 const EditorWorker = 99;
 const ErrorWorker = 3308;
 const ExtensionManagementWorker = 9006;
-const IconThemeWorker = 7009;
 const MarkdownWorker = 300;
 const OpenerWorker = 4561;
 const RendererWorker = 1;
+const TextMeasurementWorker = 7011;
 
 const FocusSelector$1 = 'Viewlet.focusSelector';
 const SetCss$1 = 'Viewlet.setCss';
@@ -1396,7 +1415,7 @@ const openUrl = async (url, platform) => {
 const {
   invoke: invoke$d,
   set: set$b
-} = create$a(IconThemeWorker);
+} = create$a(TextMeasurementWorker);
 
 const {
   invoke: invoke$c,
@@ -1412,7 +1431,7 @@ const showContextMenu2 = async (uid, menuId, x, y, args) => {
 };
 const sendMessagePortToDragAndDropWorker = async port => {
   const command = 'DragAndDrop.handleMessagePort';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToDragAndDropWorker', port, command);
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToRendererProcess', port, command);
 };
 const sendMessagePortToOpenerWorker = async (port, rpcId) => {
   const command = 'HandleMessagePort.handleMessagePort';
@@ -5198,6 +5217,7 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir, _langua
     primarySelectionIndex: 0,
     problemsHighlightedRow: -1,
     redoStack: [],
+    roundedSelection: false,
     rowHeight: 0,
     savedSelections: [],
     scrollBarHeight: 0,
@@ -5507,6 +5527,7 @@ const createEditor = async ({
     platform,
     primarySelectionIndex: 0,
     redoStack: [],
+    roundedSelection: false,
     rowHeight,
     savedSelections,
     scrollBarHeight: 0,
@@ -5764,6 +5785,26 @@ const dispose$2 = uid => {
   pendingSaves.delete(uid);
 };
 
+const getOffset = (lines, rowIndex, columnIndex) => {
+  let offset = columnIndex;
+  for (let i = 0; i < rowIndex; i++) {
+    offset += lines[i].length + 1;
+  }
+  return offset;
+};
+const getSelectedChars = editor => {
+  const {
+    lines,
+    selections
+  } = editor;
+  let selectedChars = 0;
+  for (let i = 0; i < selections.length; i += 4) {
+    const startOffset = getOffset(lines, selections[i], selections[i + 1]);
+    const endOffset = getOffset(lines, selections[i + 2], selections[i + 3]);
+    selectedChars += Math.abs(endOffset - startOffset);
+  }
+  return selectedChars;
+};
 const getEditorStatus = editor => {
   const primarySelectionIndex = editor.primarySelectionIndex || 0;
   const rowIndex = editor.selections[primarySelectionIndex + 2] || 0;
@@ -5775,6 +5816,7 @@ const getEditorStatus = editor => {
     insertSpaces: editor.insertSpaces,
     languageId: editor.languageId,
     line: rowIndex + 1,
+    selectedChars: getSelectedChars(editor),
     tabSize: editor.tabSize
   };
 };
@@ -7428,13 +7470,15 @@ const copyLineDown = editor => {
       start: position
     };
   });
-  const selectionChanges = new Uint32Array(uniqueRows.length * 4);
-  for (let i = 0; i < uniqueRows.length; i++) {
-    const rowIndex = uniqueRows[i] + i + 1;
-    selectionChanges[i * 4] = rowIndex;
-    selectionChanges[i * 4 + 1] = 0;
-    selectionChanges[i * 4 + 2] = rowIndex;
-    selectionChanges[i * 4 + 3] = 0;
+  const rowOffsets = new Map(uniqueRows.map((row, index) => [row, index + 1]));
+  const selectionChanges = new Uint32Array(selections.length);
+  for (let i = 0; i < selections.length; i += 4) {
+    const rowIndex = selections[i] + rowOffsets.get(selections[i]);
+    const columnIndex = selections[i + 1];
+    selectionChanges[i] = rowIndex;
+    selectionChanges[i + 1] = columnIndex;
+    selectionChanges[i + 2] = rowIndex;
+    selectionChanges[i + 3] = columnIndex;
   }
   return scheduleDocumentAndCursorsSelections(editor, changes, selectionChanges);
 };
@@ -7746,17 +7790,18 @@ const cursorDocumentStart = editor => {
   return scheduleSelections(editor, newSelections);
 };
 
-const moveSelectionDown = (selections, i, selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn) => {
-  moveRangeToPosition$1(selections, i, selectionEndRow + 1, selectionEndColumn);
+const moveSelectionDown = (lastRow, selections, i, selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn) => {
+  moveRangeToPosition$1(selections, i, Math.min(selectionEndRow + 1, lastRow), selectionEndColumn);
 };
-const getNewSelections$9 = selections => {
-  return map(selections, moveSelectionDown);
+const getNewSelections$9 = (selections, lastRow) => {
+  return map(selections, moveSelectionDown.bind(null, lastRow));
 };
 const cursorDown = editor => {
   const {
+    lines,
     selections
   } = editor;
-  const newSelections = getNewSelections$9(selections);
+  const newSelections = getNewSelections$9(selections, Math.max(0, lines.length - 1));
   return scheduleSelections(editor, newSelections);
 };
 
@@ -7868,24 +7913,60 @@ const cutLine = async editor => {
       rows.push(startRowIndex);
     }
   }
-  const replaceRange$1 = new Uint32Array(rows.length * 4);
-  const selectionChanges = new Uint32Array(rows.length * 4);
+  rows.sort((a, b) => a - b);
+  const ranges = [];
   const cutLines = [];
-  for (let i = 0; i < rows.length; i++) {
-    const startRowIndex = rows[i];
-    const line = lines[startRowIndex];
-    const offset = i * 4;
-    replaceRange$1[offset] = startRowIndex;
-    replaceRange$1[offset + 1] = 0;
-    replaceRange$1[offset + 2] = startRowIndex;
-    replaceRange$1[offset + 3] = line.length;
-    selectionChanges[offset] = startRowIndex;
-    selectionChanges[offset + 1] = 0;
-    selectionChanges[offset + 2] = startRowIndex;
-    selectionChanges[offset + 3] = 0;
+  const removedRows = [];
+  for (const row of rows) {
+    const line = lines[row];
+    const range = [row, 0, row, line.length];
+    if (line === '' && lines.length > 1) {
+      if (row < lines.length - 1) {
+        range[2] = row + 1;
+      } else {
+        range[0] = row - 1;
+        range[1] = lines[row - 1].length;
+      }
+      removedRows.push(row);
+    }
+    const previous = ranges.at(-1);
+    if (previous && (range[0] < previous[2] || range[0] === previous[2] && range[1] <= previous[3])) {
+      if (row === lines.length - 1 && line === '' && previous[0] > 0 && lines[previous[0]] === '') {
+        previous[0]--;
+        previous[1] = lines[previous[0]].length;
+      }
+      previous[2] = range[2];
+      previous[3] = range[3];
+    } else {
+      ranges.push(range);
+    }
     cutLines.push(line);
   }
+  const mergedRanges = [];
+  for (const range of ranges) {
+    const previous = mergedRanges.at(-1);
+    if (previous && range[0] === previous[2] && range[1] <= previous[3]) {
+      previous[2] = range[2];
+      previous[3] = range[3];
+    } else {
+      mergedRanges.push(range);
+    }
+  }
+  const replaceRange$1 = new Uint32Array(mergedRanges.flat());
   const changes = replaceRange(editor, replaceRange$1, [''], EditorCut);
+  const deletedRowCount = changes.reduce((count, change) => count + change.end.rowIndex - change.start.rowIndex, 0);
+  const lastRow = lines.length - deletedRowCount - 1;
+  const selectionChanges = new Uint32Array(rows.length * 4);
+  let removedBefore = 0;
+  for (let i = 0; i < rows.length; i++) {
+    const row = rows[i];
+    while (removedBefore < removedRows.length && removedRows[removedBefore] < row) {
+      removedBefore++;
+    }
+    const cursorRow = Math.min(row - removedBefore, lastRow);
+    selectionChanges[i * 4] = cursorRow;
+    selectionChanges[i * 4 + 2] = cursorRow;
+  }
   await writeText(joinLines(cutLines));
   return scheduleDocumentAndCursorsSelections(editor, changes, selectionChanges);
 };
@@ -8791,14 +8872,14 @@ const handleClickAtPosition = async (editor, modifier, rowIndex, columnIndex) =>
   };
 };
 
-const Editor = 3;
+const Editor$1 = 3;
 
 const handleContextMenu = async (editor, button, x, y) => {
   const {
     uid
   } = editor;
-  await showContextMenu2(uid, Editor, x, y, {
-    menuId: Editor
+  await showContextMenu2(uid, Editor$1, x, y, {
+    menuId: Editor$1
   });
   return editor;
 };
@@ -10520,10 +10601,7 @@ const getSelections$1 = editorUid => {
 };
 const setSelections$1 = async (editorUid, selections) => {
   const editor = getEditor$1(editorUid);
-  const newEditor = {
-    ...editor,
-    selections
-  };
+  const newEditor = setSelections$2(editor, selections);
   await updateEditor(editorUid, editor, newEditor);
 };
 
@@ -12825,14 +12903,16 @@ const handleSashPointerUp = (state, eventX, eventY) => {
   return state;
 };
 
-const CodeGeneratorInput$1 = 'CodeGeneratorInput';
+const CodeGeneratorInput$1 = 'CodeGeneratorInput InputBox';
 const CodeGeneratorMessage = 'CodeGeneratorMessage';
-const CodeGeneratorWidget = 'CodeGeneratorWidget';
+const CodeGeneratorWidget = 'Viewlet CodeGeneratorWidget';
 const DiagnosticError = 'DiagnosticError';
 const DiagnosticWarning = 'DiagnosticWarning';
 const CompletionDetailCloseButton = 'CompletionDetailCloseButton';
 const CompletionDetailContent = 'CompletionDetailContent';
 const Diagnostic = 'Diagnostic';
+const Editor = 'Viewlet Editor';
+const EditorMessage = 'Viewlet EditorMessage EditorMessageText EditorOverlayMessage';
 const EditorCursor = 'EditorCursor';
 const EditorHoverDiagnosticOnly = 'EditorHoverDiagnosticOnly';
 const EditorLineDecoration = 'EditorLineDecoration';
@@ -12842,14 +12922,14 @@ const EditorSelection = 'EditorSelection';
 const HoverDisplayString = 'HoverDisplayString';
 const HoverDocumentation = 'HoverDocumentation';
 const HoverEditorRow = 'HoverEditorRow';
-const HoverProblem = 'HoverProblem';
+const HoverProblem = 'HoverDisplayString HoverProblem';
 const HoverProblemDetail = 'HoverProblemDetail';
 const HoverProblemMessage = 'HoverProblemMessage';
 const IconClose = 'IconClose';
-const InputBox = 'InputBox';
 const MaskIcon = 'MaskIcon';
-const SelectionUnfocused = 'SelectionUnfocused';
-const Viewlet = 'Viewlet';
+const SelectionUnfocused = 'EditorSelection SelectionUnfocused';
+const TextEditorErrorIcon = 'EditorTextIcon EditorTextIconError MaskIcon MaskIconError';
+const TextEditorError = 'Viewlet TextEditorError';
 
 const HandleBeforeInput = 1;
 const HandleBlur = 2;
@@ -13220,7 +13300,7 @@ const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
   if (diagnostics && diagnostics.length > 0) {
     dom.push({
       childCount: diagnostics.length * 2,
-      className: mergeClassNames(HoverDisplayString, HoverProblem),
+      className: HoverProblem,
       type: Div
     });
     for (const diagnostic of diagnostics) {
@@ -13395,7 +13475,7 @@ const executeViewletCommand$1 = async (commandMap, uid, commandId, ...args) => {
     throw new TypeError(`Viewlet command not found: ${commandId}`);
   }
   await fn(uid, ...args);
-  await invoke$c('Viewlet.requestRender', uid);
+  await invoke$c('Viewlet.executeViewletCommand', uid, '__renderPending', false);
 };
 
 const executeWidgetCommand = async (editor, name, method, _uid, widgetId, ...params) => {
@@ -14061,7 +14141,7 @@ const getMenuEntries = () => {
 };
 
 const getMenuIds = () => {
-  return [Editor$1];
+  return [Editor$2];
 };
 
 const getProblems = async () => {
@@ -14247,23 +14327,14 @@ const kFontSize = 'editor.fontSize';
 const kFontFamily = 'editor.fontFamily';
 const kLetterSpacing = 'editor.letterSpacing';
 const kTabSize = 'editor.tabSize';
-const kInsertSpaces = 'editor.insertSpaces';
 const kLineNumbers = 'editor.lineNumbers';
 const kHighlightActiveLineNumber = 'editor.highlightActiveLineNumber';
-const kFormatOnSave = 'editor.formatOnSave';
-const kDiagnostics = 'editor.diagnostics';
 const kQuickSuggestions = 'editor.quickSuggestions';
 const kAutoClosingQuotes = 'editor.autoClosingQuotes';
 const kAutoClosingBrackets = 'editor.autoClosingBrackets';
 const kFontWeight = 'editor.fontWeight';
-const kHover = 'editor.hover';
 const kMinimapEnabled = 'editor.minimap.enabled';
 const kMergeConflictActions = 'editor.mergeConflictActions';
-const kBreadcrumbsEnabled = 'breadcrumbs.enabled';
-const kDragAndDropEnabled = 'editor.dragAndDrop';
-const getDragAndDropEnabled = async () => {
-  return (await get$3(kDragAndDropEnabled)) ?? true;
-};
 const isAutoClosingBracketsEnabled = async () => {
   return Boolean(await get$3(kAutoClosingBrackets));
 };
@@ -14282,9 +14353,6 @@ const getRowHeight = async () => {
 const getFontSize = async () => {
   return (await get$3(kFontSize)) || 15; // TODO find out if it is possible to use all numeric values for settings for efficiency, maybe settings could be an array
 };
-const getHoverEnabled = async () => {
-  return (await get$3(kHover)) ?? true;
-};
 const getFontFamily = async () => {
   return (await get$3(kFontFamily)) || 'Fira Code';
 };
@@ -14297,9 +14365,6 @@ const getLetterSpacing = async () => {
 const getTabSize = async () => {
   return (await get$3(kTabSize)) || 2;
 };
-const getInsertSpaces = async () => {
-  return (await get$3(kInsertSpaces)) ?? true;
-};
 const getLineNumbers = async () => {
   return (await get$3(kLineNumbers)) ?? false;
 };
@@ -14309,12 +14374,6 @@ const getHighlightActiveLineNumber = async () => {
 const getCompletionTriggerCharacters = async () => {
   return ['.', '/'];
 };
-const getFormatOnSave = async () => {
-  return (await get$3(kFormatOnSave)) ?? false;
-};
-const diagnosticsEnabled = async () => {
-  return (await get$3(kDiagnostics)) ?? false;
-};
 const getFontWeight = async () => {
   return (await get$3(kFontWeight)) ?? 400;
 };
@@ -14324,24 +14383,22 @@ const getMinimapEnabled = async () => {
 const getMergeConflictActionsEnabled = async () => {
   return (await get$3(kMergeConflictActions)) ?? false;
 };
-const getBreadcrumbsEnabled = async () => {
-  return (await get$3(kBreadcrumbsEnabled)) ?? false;
-};
 
 const getEditorPreferences = async () => {
-  const [diagnosticsEnabled$1, fontFamily, fontSize, fontWeight, formatOnSave, hoverEnabled, isAutoClosingBracketsEnabled$1, isAutoClosingQuotesEnabled$1, isAutoClosingTagsEnabled$1, isQuickSuggestionsEnabled$1, lineNumbers, highlightActiveLineNumber, rowHeight, tabSize, letterSpacing, completionTriggerCharacters, minimapEnabled, mergeConflictActionsEnabled, breadcrumbsEnabled, insertSpaces, dragAndDropEnabled] = await Promise.all([diagnosticsEnabled(), getFontFamily(), getFontSize(), getFontWeight(), getFormatOnSave(), getHoverEnabled(), isAutoClosingBracketsEnabled(), isAutoClosingQuotesEnabled(), isAutoClosingTagsEnabled(), isQuickSuggestionsEnabled(), getLineNumbers(), getHighlightActiveLineNumber(), getRowHeight(), getTabSize(), getLetterSpacing(), getCompletionTriggerCharacters(), getMinimapEnabled(), getMergeConflictActionsEnabled(), getBreadcrumbsEnabled(), getInsertSpaces(), getDragAndDropEnabled()]);
+  const [diagnosticsEnabled, fontFamily, fontSize, fontWeight, formatOnSave, hoverEnabled, isAutoClosingBracketsEnabled$1, isAutoClosingQuotesEnabled$1, isAutoClosingTagsEnabled$1, isQuickSuggestionsEnabled$1, lineNumbers, highlightActiveLineNumber, rowHeight, tabSize, letterSpacing, completionTriggerCharacters, minimapEnabled, mergeConflictActionsEnabled, breadcrumbsEnabled, insertSpaces, dragAndDropEnabled, roundedSelection, combineWhitespaceTokens] = await Promise.all([get$3('editor.diagnostics'), getFontFamily(), getFontSize(), getFontWeight(), get$3('editor.formatOnSave'), get$3('editor.hover'), isAutoClosingBracketsEnabled(), isAutoClosingQuotesEnabled(), isAutoClosingTagsEnabled(), isQuickSuggestionsEnabled(), getLineNumbers(), getHighlightActiveLineNumber(), getRowHeight(), getTabSize(), getLetterSpacing(), getCompletionTriggerCharacters(), getMinimapEnabled(), getMergeConflictActionsEnabled(), get$3('breadcrumbs.enabled'), get$3('editor.insertSpaces'), get$3('editor.dragAndDrop'), get$3('editor.roundedSelection'), get$3('editor.combineWhitespaceTokens')]);
   return {
-    breadcrumbsEnabled,
+    breadcrumbsEnabled: breadcrumbsEnabled ?? false,
+    combineWhitespaceTokens: combineWhitespaceTokens ?? true,
     completionTriggerCharacters,
-    diagnosticsEnabled: diagnosticsEnabled$1,
-    dragAndDropEnabled,
+    diagnosticsEnabled: diagnosticsEnabled ?? false,
+    dragAndDropEnabled: dragAndDropEnabled ?? true,
     fontFamily,
     fontSize,
     fontWeight,
-    formatOnSave,
+    formatOnSave: formatOnSave ?? false,
     highlightActiveLineNumber,
-    hoverEnabled,
-    insertSpaces,
+    hoverEnabled: hoverEnabled ?? true,
+    insertSpaces: insertSpaces ?? true,
     isAutoClosingBracketsEnabled: isAutoClosingBracketsEnabled$1,
     isAutoClosingQuotesEnabled: isAutoClosingQuotesEnabled$1,
     isAutoClosingTagsEnabled: isAutoClosingTagsEnabled$1,
@@ -14350,6 +14407,7 @@ const getEditorPreferences = async () => {
     lineNumbers,
     mergeConflictActionsEnabled,
     minimapEnabled,
+    roundedSelection: roundedSelection === true,
     rowHeight,
     tabSize
   };
@@ -14675,6 +14733,7 @@ const loadContent = async (state, savedState) => {
   } = state;
   const {
     breadcrumbsEnabled,
+    combineWhitespaceTokens,
     completionTriggerCharacters,
     diagnosticsEnabled,
     dragAndDropEnabled,
@@ -14693,6 +14752,7 @@ const loadContent = async (state, savedState) => {
     lineNumbers,
     mergeConflictActionsEnabled,
     minimapEnabled,
+    roundedSelection,
     rowHeight,
     tabSize
   } = await getEditorPreferences();
@@ -14710,6 +14770,7 @@ const loadContent = async (state, savedState) => {
     ...state,
     breadcrumbsEnabled,
     charWidth,
+    combineWhitespaceTokens,
     completionTriggerCharacters,
     diagnosticsEnabled,
     dragAndDropEnabled,
@@ -14730,6 +14791,7 @@ const loadContent = async (state, savedState) => {
     loadError: '',
     mergeConflictActionsEnabled,
     minimapEnabled,
+    roundedSelection,
     rowHeight,
     tabSize,
     tokenizerId: newTokenizerId
@@ -14939,6 +15001,10 @@ const getCss = (uid, rowHeight, scrollBarHeight, scrollBarTop, scrollBarWidth, s
   --ScrollBarWidth: ${scrollBarWidth}px;
   --ScrollBarLeft: ${scrollBarLeft}px;
 }
+${editorSelector} .SelectionTopLeft { border-top-left-radius: 3px; }
+${editorSelector} .SelectionTopRight { border-top-right-radius: 3px; }
+${editorSelector} .SelectionBottomRight { border-bottom-right-radius: 3px; }
+${editorSelector} .SelectionBottomLeft { border-bottom-left-radius: 3px; }
 ${editorSelector} .EditorLayers {
   height: calc(100% + var(--EditorRowHeight));
   translate: ${translate};
@@ -15089,6 +15155,22 @@ const Button = 'button';
 const Code = 'code';
 const TextBox = 'textbox';
 
+const combineWhitespaceTokens = tokens => {
+  const combined = [];
+  for (let i = 0; i < tokens.length; i += 2) {
+    const tokenText = tokens[i];
+    const tokenClass = tokens[i + 1];
+    const previousClass = combined.at(-1);
+    // Decorations add a class after the syntax class; preserve their exact ranges.
+    if (previousClass && /^[ \t]+$/.test(tokenText) && !tokenClass.includes(' ', 6) && !previousClass.includes(' ', 6)) {
+      combined[combined.length - 2] += tokenText;
+    } else {
+      combined.push(tokenText, tokens[i + 1]);
+    }
+  }
+  return combined;
+};
+
 const getPathname = uri => {
   return decodeURIComponent(URL.canParse(uri) ? new URL(uri).pathname : uri);
 };
@@ -15383,9 +15465,61 @@ const getEditorRowsVirtualDom = (textInfos, differences, lineNumbers = true, hig
   }, ...rowsDom];
 };
 
-const getSelectionsVirtualDom = (selections, focused = true) => {
+const getSelectionCornerClasses = selections => {
+  const edges = [new Map(), new Map()];
+  for (let i = 0; i < selections.length; i += 4) {
+    const [x, y, width, height] = selections.slice(i, i + 4);
+    if (width <= 0 || height <= 0) {
+      continue;
+    }
+    for (let side = 0; side < 2; side++) {
+      const key = y + side * height;
+      const row = edges[side].get(key) || [];
+      row.push([x, x + width]);
+      edges[side].set(key, row);
+    }
+  }
+  // Prefix maxima make overlapping intervals searchable in logarithmic time.
+  for (const rows of edges) {
+    for (const row of rows.values()) {
+      row.sort((a, b) => a[0] - b[0]);
+      for (let i = 1; i < row.length; i++) {
+        row[i][1] = Math.max(row[i][1], row[i - 1][1]);
+      }
+    }
+  }
+  const result = [];
+  for (let i = 0; i < selections.length; i += 4) {
+    const [x, y, width, height] = selections.slice(i, i + 4);
+    let corners = '';
+    if (width > 0 && height > 0) {
+      for (const [vertical, horizontal] of [[0, 0], [0, 1], [1, 1], [1, 0]]) {
+        const row = edges[1 - vertical].get(y + vertical * height) || [];
+        const edge = x + horizontal * width;
+        let low = 0;
+        let high = row.length;
+        while (low < high) {
+          const mid = low + high >>> 1;
+          if (horizontal ? row[mid][0] < edge : row[mid][0] <= edge) {
+            low = mid + 1;
+          } else {
+            high = mid;
+          }
+        }
+        if (!low || (horizontal ? row[low - 1][1] < edge : row[low - 1][1] <= edge)) {
+          corners += ` Selection${vertical ? 'Bottom' : 'Top'}${horizontal ? 'Right' : 'Left'}`;
+        }
+      }
+    }
+    result.push(corners);
+  }
+  return result;
+};
+
+const getSelectionsVirtualDom = (selections, focused = true, roundedSelection = false) => {
+  const corners = roundedSelection ? getSelectionCornerClasses(selections.map(value => typeof value === 'number' ? value : Number(value.replace(/px$/, '')))) : [];
   const dom = [];
-  const className = focused ? EditorSelection : mergeClassNames(EditorSelection, SelectionUnfocused);
+  const className = focused ? EditorSelection : SelectionUnfocused;
   for (let i = 0; i < selections.length; i += 4) {
     const x = selections[i];
     const y = selections[i + 1];
@@ -15393,7 +15527,7 @@ const getSelectionsVirtualDom = (selections, focused = true) => {
     const height = selections[i + 3];
     dom.push({
       childCount: 0,
-      className,
+      className: className + (corners[i / 4] || ''),
       height,
       left: x,
       top: y,
@@ -15404,8 +15538,8 @@ const getSelectionsVirtualDom = (selections, focused = true) => {
   return dom;
 };
 
-const getEditorSelectionsVirtualDom = (selectionInfos, focused = true) => {
-  const selectionsDom = getSelectionsVirtualDom(selectionInfos, focused);
+const getEditorSelectionsVirtualDom = (selectionInfos, focused = true, roundedSelection = false) => {
+  const selectionsDom = getSelectionsVirtualDom(selectionInfos, focused, roundedSelection);
   return [{
     childCount: selectionInfos.length / 4,
     className: 'Selections',
@@ -15418,8 +15552,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) => {
-  return [editorLayersNode, ...getEditorSelectionsVirtualDom(selectionInfos, focused), ...getEditorRowsVirtualDom(textInfos, differences, lineNumbers, highlightedLine, visibleLineIndices, endOfLineDecorations, visibleViewLineIndices, problemsHighlightedRow), ...getEditorCursorsVirtualDom(cursorInfos), ...getEditorDiagnosticsVirtualDom(diagnostics, bracketMatchInfos)];
+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), ...getEditorDiagnosticsVirtualDom(diagnostics, bracketMatchInfos)];
 };
 
 const getEditorScrollBarDiagnosticsVirtualDom = scrollBarDiagnostics => {
@@ -15485,13 +15619,14 @@ const getEditorContentVirtualDom = ({
   highlightedLine = -1,
   lineNumbers = true,
   problemsHighlightedRow = -1,
+  roundedSelection = false,
   scrollBarDiagnostics = [],
   selectionInfos = [],
   textInfos,
   visibleLineIndices = [],
   visibleViewLineIndices = []
 }) => {
-  return [editorContentNode, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics, visibleLineIndices, endOfLineDecorations, bracketMatchInfos, focused, visibleViewLineIndices, problemsHighlightedRow), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom()];
+  return [editorContentNode, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics, visibleLineIndices, endOfLineDecorations, bracketMatchInfos, focused, visibleViewLineIndices, problemsHighlightedRow, roundedSelection), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom()];
 };
 
 const getGutterInfoVirtualDom = (gutterInfo, activeLineNumber) => {
@@ -15608,7 +15743,7 @@ const getPrimaryCursorRowIndex = (selections, primarySelectionIndex = 0) => {
 
 const textEditorErrorIconNode = {
   childCount: 0,
-  className: mergeClassNames('EditorTextIcon', 'EditorTextIconError', 'MaskIcon', 'MaskIconError'),
+  className: TextEditorErrorIcon,
   type: Div
 };
 const textEditorErrorMessageNode = {
@@ -15633,6 +15768,7 @@ const getEditorVirtualDom = ({
   bracketMatchInfos = [],
   breadcrumbsEnabled = false,
   breakPoints = [],
+  combineWhitespaceTokens: combineWhitespaceTokens$1 = false,
   cursorInfos = [],
   diagnostics = [],
   differences,
@@ -15653,6 +15789,7 @@ const getEditorVirtualDom = ({
   minLineY = 0,
   primarySelectionIndex = 0,
   problemsHighlightedRow = -1,
+  roundedSelection = false,
   scrollBarDiagnostics = [],
   selectionInfos = [],
   selections = new Uint32Array(),
@@ -15666,7 +15803,7 @@ const getEditorVirtualDom = ({
   if (loadError) {
     return [{
       childCount: 2,
-      className: mergeClassNames('Viewlet', 'TextEditorError'),
+      className: TextEditorError,
       'data-uid': uid,
       role: Code,
       type: Div
@@ -15690,7 +15827,7 @@ const getEditorVirtualDom = ({
   }) : [];
   return [{
     childCount: (showGutter ? 2 : 1) + (minimapEnabled ? 1 : 0) + (breadcrumbsEnabled ? 1 : 0),
-    className: mergeClassNames('Viewlet', 'Editor'),
+    className: Editor,
     'data-uid': uid,
     onContextMenu: HandleContextMenu,
     role: Code,
@@ -15705,9 +15842,10 @@ const getEditorVirtualDom = ({
     highlightedLine,
     lineNumbers,
     problemsHighlightedRow,
+    roundedSelection,
     scrollBarDiagnostics,
     selectionInfos,
-    textInfos,
+    textInfos: combineWhitespaceTokens$1 ? textInfos.map(combineWhitespaceTokens) : textInfos,
     visibleLineIndices: visibleLineIndices || [],
     visibleViewLineIndices
   }), ...minimapDom];
@@ -15924,10 +16062,10 @@ const renderSelections = {
       selectionInfos = []
     } = newState;
     const cursorsDom = getCursorsVirtualDom(cursorInfos);
-    const selectionsDom = getSelectionsVirtualDom(selectionInfos, newState.focused);
+    const selectionsDom = getSelectionsVirtualDom(selectionInfos, newState.focused, newState.roundedSelection);
     return [/* method */'setSelections', cursorsDom, selectionsDom];
   },
-  isEqual: (oldState, newState) => oldState.cursorInfos === newState.cursorInfos && oldState.selectionInfos === newState.selectionInfos && oldState.focused === newState.focused
+  isEqual: (oldState, newState) => oldState.cursorInfos === newState.cursorInfos && oldState.selectionInfos === newState.selectionInfos && oldState.focused === newState.focused && oldState.roundedSelection === newState.roundedSelection
 };
 const renderCss = {
   apply: renderCss$1,
@@ -16915,7 +17053,7 @@ const CodeGeneratorInput = 'CodeGeneratorInput';
 
 const codeGeneratorNode = {
   childCount: 2,
-  className: mergeClassNames(Viewlet, CodeGeneratorWidget),
+  className: CodeGeneratorWidget,
   type: Div
 };
 const codeGeneratorMessageNode = {
@@ -16928,7 +17066,7 @@ const getCodeGeneratorVirtualDom = state => {
   const enterCode$1 = enterCode();
   return [codeGeneratorNode, {
     childCount: 0,
-    className: mergeClassNames(CodeGeneratorInput$1, InputBox),
+    className: CodeGeneratorInput$1,
     name: CodeGeneratorInput,
     placeholder: enterCode$1,
     type: Input
@@ -17210,7 +17348,7 @@ const render = widget => {
   } = widget.newState;
   const dom = [{
     childCount: 1,
-    className: mergeClassNames('Viewlet', 'EditorMessage', 'EditorMessageText', 'EditorOverlayMessage'),
+    className: EditorMessage,
     style: `left:${x}px;top:${y}px;`,
     type: Div
   }, text(message)];

package/dist/settings.json

@@ -1,4 +1,12 @@
 [
+  {
+    "category": "text-editor",
+    "description": "Combine space and tab tokens with the preceding token when rendering to reduce DOM nodes",
+    "heading": "Combine Whitespace Tokens",
+    "id": "editor.combineWhitespaceTokens",
+    "type": "boolean",
+    "value": true
+  },
   {
     "category": "text-editor",
     "description": "The font size of the editor",
@@ -887,7 +895,7 @@
     "heading": "Rounded Selection",
     "id": "editor.roundedSelection",
     "type": "boolean",
-    "value": "true"
+    "value": "false"
   },
   {
     "category": "text-editor",

package/package.json

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