@lvce-editor/editor-worker 19.60.2 → 19.61.0

package/dist/editorWorkerMain.js

@@ -12231,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) {
@@ -12308,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) {
@@ -14282,9 +14329,10 @@ const getBreadcrumbsEnabled = async () => {
 };
 
 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$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, combineWhitespaceTokens] = await Promise.all([diagnosticsEnabled(), getFontFamily(), getFontSize(), getFontWeight(), getFormatOnSave(), getHoverEnabled(), isAutoClosingBracketsEnabled(), isAutoClosingQuotesEnabled(), isAutoClosingTagsEnabled(), isQuickSuggestionsEnabled(), getLineNumbers(), getHighlightActiveLineNumber(), getRowHeight(), getTabSize(), getLetterSpacing(), getCompletionTriggerCharacters(), getMinimapEnabled(), getMergeConflictActionsEnabled(), getBreadcrumbsEnabled(), getInsertSpaces(), getDragAndDropEnabled(), get$3('editor.combineWhitespaceTokens')]);
   return {
     breadcrumbsEnabled,
+    combineWhitespaceTokens: combineWhitespaceTokens ?? false,
     completionTriggerCharacters,
     diagnosticsEnabled: diagnosticsEnabled$1,
     dragAndDropEnabled,
@@ -14628,6 +14676,7 @@ const loadContent = async (state, savedState) => {
   } = state;
   const {
     breadcrumbsEnabled,
+    combineWhitespaceTokens,
     completionTriggerCharacters,
     diagnosticsEnabled,
     dragAndDropEnabled,
@@ -14663,6 +14712,7 @@ const loadContent = async (state, savedState) => {
     ...state,
     breadcrumbsEnabled,
     charWidth,
+    combineWhitespaceTokens,
     completionTriggerCharacters,
     diagnosticsEnabled,
     dragAndDropEnabled,
@@ -14908,10 +14958,10 @@ ${editorSelector} .GutterRows {
 }
 ${editorSelector} .EditorRow,
 ${editorSelector} .LineNumber {
-  contain: size style;
   flex: none;
 }
 ${editorSelector} .EditorRow {
+  contain: size style;
   height: var(--EditorRowHeight);
   line-height: var(--EditorRowHeight);
 }
@@ -14956,6 +15006,7 @@ ${editorSelector} .EditorLineDecoration {
   user-select: none;
 }
 ${editorSelector} .LineNumber {
+  contain: content;
   position: relative;
 }
 ${editorSelector} .EditorGutterDecoration {
@@ -15041,6 +15092,19 @@ 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];
+    if (combined.length > 0 && /^[ \t]+$/.test(tokenText)) {
+      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);
 };
@@ -15585,6 +15649,7 @@ const getEditorVirtualDom = ({
   bracketMatchInfos = [],
   breadcrumbsEnabled = false,
   breakPoints = [],
+  combineWhitespaceTokens: combineWhitespaceTokens$1 = false,
   cursorInfos = [],
   diagnostics = [],
   differences,
@@ -15659,7 +15724,7 @@ const getEditorVirtualDom = ({
     problemsHighlightedRow,
     scrollBarDiagnostics,
     selectionInfos,
-    textInfos,
+    textInfos: combineWhitespaceTokens$1 ? textInfos.map(combineWhitespaceTokens) : textInfos,
     visibleLineIndices: visibleLineIndices || [],
     visibleViewLineIndices
   }), ...minimapDom];

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": false
+  },
   {
     "category": "text-editor",
     "description": "The font size of the editor",

package/package.json

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