@lvce-editor/editor-worker 19.47.1 → 19.49.0

package/dist/editorWorkerMain.js

@@ -5040,6 +5040,7 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
     handleOffsetX: 0,
     hasListener: false,
     height,
+    highlightActiveLineNumber: true,
     highlightedLine: -1,
     hoverEnabled: false,
     id,
@@ -5275,6 +5276,7 @@ const createEditor = async ({
   fontWeight,
   formatOnSave,
   height,
+  highlightActiveLineNumber = true,
   hoverEnabled,
   id,
   isAutoClosingBracketsEnabled,
@@ -5338,6 +5340,7 @@ const createEditor = async ({
     handleOffsetX: 0,
     hasListener: false,
     height,
+    highlightActiveLineNumber,
     id,
     incrementalEdits: emptyIncrementalEdits,
     insertSpaces: true,
@@ -5532,7 +5535,7 @@ const isEqual$3 = (oldState, newState) => {
 };
 
 const isEqual$2 = (oldState, newState) => {
-  return 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.gutterDecorations === newState.gutterDecorations && oldState.highlightedLine === newState.highlightedLine && oldState.lineNumbers === newState.lineNumbers && oldState.loadError === newState.loadError && oldState.textInfos === newState.textInfos && oldState.differences === newState.differences && oldState.initial === newState.initial && oldState.selectionInfos === newState.selectionInfos && oldState.selections === newState.selections && oldState.workspaceUri === newState.workspaceUri;
+  return 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.lineNumbers === newState.lineNumbers && oldState.loadError === newState.loadError && oldState.textInfos === newState.textInfos && oldState.differences === newState.differences && oldState.initial === newState.initial && oldState.selectionInfos === newState.selectionInfos && oldState.selections === newState.selections && oldState.workspaceUri === newState.workspaceUri;
 };
 
 const isEqual$1 = (oldState, newState) => {
@@ -12552,6 +12555,7 @@ const HoverProblemMessage = 'HoverProblemMessage';
 const IconClose = 'IconClose';
 const InputBox = 'InputBox';
 const MaskIcon = 'MaskIcon';
+const SelectionUnfocused = 'SelectionUnfocused';
 const Viewlet = 'Viewlet';
 
 const HandleBeforeInput = 1;
@@ -13685,6 +13689,7 @@ const kLetterSpacing = 'editor.letterSpacing';
 const kTabSize = 'editor.tabSize';
 const kInsertSpaces = 'editor.insertSpaces';
 const kLineNumbers = 'editor.lineNumbers';
+const kHighlightActiveLineNumber = 'editor.highlightActiveLineNumber';
 const kDiagnostics = 'editor.diagnostics';
 const kQuickSuggestions = 'editor.quickSuggestions';
 const kAutoClosingQuotes = 'editor.autoClosingQuotes';
@@ -13736,6 +13741,9 @@ const getInsertSpaces = async () => {
 const getLineNumbers = async () => {
   return (await get$3(kLineNumbers)) ?? false;
 };
+const getHighlightActiveLineNumber = async () => {
+  return (await get$3(kHighlightActiveLineNumber)) ?? true;
+};
 const getCompletionTriggerCharacters = async () => {
   return ['.', '/'];
 };
@@ -13753,7 +13761,7 @@ const getBreadcrumbsEnabled = async () => {
 };
 
 const getEditorPreferences = async () => {
-  const [diagnosticsEnabled$1, fontFamily, fontSize, fontWeight, hoverEnabled, isAutoClosingBracketsEnabled$1, isAutoClosingQuotesEnabled$1, isAutoClosingTagsEnabled$1, isQuickSuggestionsEnabled$1, lineNumbers, rowHeight, tabSize, letterSpacing, completionTriggerCharacters, minimapEnabled, breadcrumbsEnabled, insertSpaces, dragAndDropEnabled] = await Promise.all([diagnosticsEnabled(), getFontFamily(), getFontSize(), getFontWeight(), getHoverEnabled(), isAutoClosingBracketsEnabled(), isAutoClosingQuotesEnabled(), isAutoClosingTagsEnabled(), isQuickSuggestionsEnabled(), getLineNumbers(), getRowHeight(), getTabSize(), getLetterSpacing(), getCompletionTriggerCharacters(), getMinimapEnabled(), getBreadcrumbsEnabled(), getInsertSpaces(), getDragAndDropEnabled()]);
+  const [diagnosticsEnabled$1, fontFamily, fontSize, fontWeight, hoverEnabled, isAutoClosingBracketsEnabled$1, isAutoClosingQuotesEnabled$1, isAutoClosingTagsEnabled$1, isQuickSuggestionsEnabled$1, lineNumbers, highlightActiveLineNumber, rowHeight, tabSize, letterSpacing, completionTriggerCharacters, minimapEnabled, breadcrumbsEnabled, insertSpaces, dragAndDropEnabled] = await Promise.all([diagnosticsEnabled(), getFontFamily(), getFontSize(), getFontWeight(), getHoverEnabled(), isAutoClosingBracketsEnabled(), isAutoClosingQuotesEnabled(), isAutoClosingTagsEnabled(), isQuickSuggestionsEnabled(), getLineNumbers(), getHighlightActiveLineNumber(), getRowHeight(), getTabSize(), getLetterSpacing(), getCompletionTriggerCharacters(), getMinimapEnabled(), getBreadcrumbsEnabled(), getInsertSpaces(), getDragAndDropEnabled()]);
   return {
     breadcrumbsEnabled,
     completionTriggerCharacters,
@@ -13762,6 +13770,7 @@ const getEditorPreferences = async () => {
     fontFamily,
     fontSize,
     fontWeight,
+    highlightActiveLineNumber,
     hoverEnabled,
     insertSpaces,
     isAutoClosingBracketsEnabled: isAutoClosingBracketsEnabled$1,
@@ -14102,6 +14111,7 @@ const loadContent = async (state, savedState) => {
     fontFamily,
     fontSize,
     fontWeight,
+    highlightActiveLineNumber,
     hoverEnabled,
     insertSpaces,
     isAutoClosingBracketsEnabled,
@@ -14134,6 +14144,7 @@ const loadContent = async (state, savedState) => {
     fontFamily,
     fontSize,
     fontWeight,
+    highlightActiveLineNumber,
     hoverEnabled,
     insertSpaces,
     isAutoClosingBracketsEnabled,
@@ -14961,8 +14972,9 @@ const getEditorRowsVirtualDom = (textInfos, differences, lineNumbers = true, hig
   }, ...rowsDom];
 };
 
-const getSelectionsVirtualDom = selections => {
+const getSelectionsVirtualDom = (selections, focused = true) => {
   const dom = [];
+  const className = focused ? EditorSelection : mergeClassNames(EditorSelection, SelectionUnfocused);
   for (let i = 0; i < selections.length; i += 4) {
     const x = selections[i];
     const y = selections[i + 1];
@@ -14970,7 +14982,7 @@ const getSelectionsVirtualDom = selections => {
     const height = selections[i + 3];
     dom.push({
       childCount: 0,
-      className: EditorSelection,
+      className,
       height,
       left: x,
       top: y,
@@ -14981,8 +14993,8 @@ const getSelectionsVirtualDom = selections => {
   return dom;
 };
 
-const getEditorSelectionsVirtualDom = selectionInfos => {
-  const selectionsDom = getSelectionsVirtualDom(selectionInfos);
+const getEditorSelectionsVirtualDom = (selectionInfos, focused = true) => {
+  const selectionsDom = getSelectionsVirtualDom(selectionInfos, focused);
   return [{
     childCount: selectionInfos.length / 4,
     className: 'Selections',
@@ -14995,8 +15007,8 @@ const editorLayersNode = {
   className: 'EditorLayers',
   type: Div
 };
-const getEditorLayersVirtualDom = (selectionInfos, textInfos, differences, lineNumbers = true, highlightedLine = -1, cursorInfos = [], diagnostics = [], visibleLineIndices = [], endOfLineDecorations = [], bracketMatchInfos = []) => {
-  return [editorLayersNode, ...getEditorSelectionsVirtualDom(selectionInfos), ...getEditorRowsVirtualDom(textInfos, differences, lineNumbers, highlightedLine, visibleLineIndices, endOfLineDecorations), ...getEditorCursorsVirtualDom(cursorInfos), ...getEditorDiagnosticsVirtualDom(diagnostics, bracketMatchInfos)];
+const getEditorLayersVirtualDom = (selectionInfos, textInfos, differences, lineNumbers = true, highlightedLine = -1, cursorInfos = [], diagnostics = [], visibleLineIndices = [], endOfLineDecorations = [], bracketMatchInfos = [], focused = true) => {
+  return [editorLayersNode, ...getEditorSelectionsVirtualDom(selectionInfos, focused), ...getEditorRowsVirtualDom(textInfos, differences, lineNumbers, highlightedLine, visibleLineIndices, endOfLineDecorations), ...getEditorCursorsVirtualDom(cursorInfos), ...getEditorDiagnosticsVirtualDom(diagnostics, bracketMatchInfos)];
 };
 
 const getEditorScrollBarDiagnosticsVirtualDom = scrollBarDiagnostics => {
@@ -15058,6 +15070,7 @@ const getEditorContentVirtualDom = ({
   diagnostics = [],
   differences,
   endOfLineDecorations = [],
+  focused = true,
   highlightedLine = -1,
   lineNumbers = true,
   scrollBarDiagnostics = [],
@@ -15065,7 +15078,7 @@ const getEditorContentVirtualDom = ({
   textInfos,
   visibleLineIndices = []
 }) => {
-  return [editorContentNode, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics, visibleLineIndices, endOfLineDecorations, bracketMatchInfos), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom()];
+  return [editorContentNode, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics, visibleLineIndices, endOfLineDecorations, bracketMatchInfos, focused), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom()];
 };
 
 const getGutterInfoVirtualDom = (gutterInfo, activeLineNumber) => {
@@ -15194,8 +15207,10 @@ const getEditorVirtualDom = ({
   differences,
   documentSymbols = [],
   endOfLineDecorations = [],
+  focused = true,
   gutterDecorations = [],
   gutterInfos = [],
+  highlightActiveLineNumber = true,
   highlightedLine = -1,
   lightBulbRowIndex = -1,
   lineNumbers = true,
@@ -15227,7 +15242,8 @@ const getEditorVirtualDom = ({
   const visibleGutterInfos = breakPoints.length > 0 || gutterDecorations.length > 0 || visibleLineIndices ? getGutterInfos(minLineY, maxLineY, breakPoints, lineNumbers, visibleLineIndices, lightBulbRowIndex, gutterDecorations) : gutterInfos;
   const showGutter = lineNumbers || breakPoints.length > 0 || lightBulbRowIndex >= 0 || gutterDecorations.length > 0;
   const primaryCursorRowIndex = getPrimaryCursorRowIndex(selections, primarySelectionIndex);
-  const gutterDom = showGutter ? getEditorGutterVirtualDom(visibleGutterInfos, primaryCursorRowIndex + 1) : [];
+  const activeLineNumber = highlightActiveLineNumber ? primaryCursorRowIndex + 1 : -1;
+  const gutterDom = showGutter ? getEditorGutterVirtualDom(visibleGutterInfos, activeLineNumber) : [];
   const minimapDom = getMinimapVirtualDom(minimapEnabled, minimapLines, minLineY);
   const breadcrumbsDom = breadcrumbsEnabled ? getEditorBreadcrumbsVirtualDom({
     breadcrumbsEnabled,
@@ -15251,6 +15267,7 @@ const getEditorVirtualDom = ({
     diagnostics,
     differences,
     endOfLineDecorations,
+    focused,
     highlightedLine,
     lineNumbers,
     scrollBarDiagnostics,
@@ -15457,10 +15474,10 @@ const renderSelections = {
       selectionInfos = []
     } = newState;
     const cursorsDom = getCursorsVirtualDom(cursorInfos);
-    const selectionsDom = getSelectionsVirtualDom(selectionInfos);
+    const selectionsDom = getSelectionsVirtualDom(selectionInfos, newState.focused);
     return [/* method */'setSelections', cursorsDom, selectionsDom];
   },
-  isEqual: (oldState, newState) => oldState.cursorInfos === newState.cursorInfos && oldState.selectionInfos === newState.selectionInfos
+  isEqual: (oldState, newState) => oldState.cursorInfos === newState.cursorInfos && oldState.selectionInfos === newState.selectionInfos && oldState.focused === newState.focused
 };
 const renderCss = {
   apply: renderCss$1,
@@ -15492,6 +15509,7 @@ const renderGutterInfo = {
     const {
       breakPoints,
       gutterDecorations,
+      highlightActiveLineNumber,
       lightBulbRowIndex,
       lineNumbers,
       maxLineY,
@@ -15505,10 +15523,11 @@ const renderGutterInfo = {
     }
     const gutterInfos = getGutterInfos(minLineY, maxLineY, breakPoints, lineNumbers, visibleLineIndices, lightBulbRowIndex, gutterDecorations);
     const primaryCursorRowIndex = getPrimaryCursorRowIndex(selections, primarySelectionIndex);
-    const dom = getEditorGutterVirtualDom$1(gutterInfos, primaryCursorRowIndex + 1);
+    const activeLineNumber = highlightActiveLineNumber ? primaryCursorRowIndex + 1 : -1;
+    const dom = getEditorGutterVirtualDom$1(gutterInfos, activeLineNumber);
     return ['renderGutter', dom];
   },
-  isEqual: (oldState, newState) => oldState.breakPoints === newState.breakPoints && oldState.gutterDecorations === newState.gutterDecorations && oldState.lightBulbRowIndex === newState.lightBulbRowIndex && oldState.foldingRanges === newState.foldingRanges && oldState.lineNumbers === newState.lineNumbers && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && getPrimaryCursorRowIndex(oldState.selections, oldState.primarySelectionIndex) === getPrimaryCursorRowIndex(newState.selections, newState.primarySelectionIndex)
+  isEqual: (oldState, newState) => oldState.breakPoints === newState.breakPoints && oldState.gutterDecorations === newState.gutterDecorations && oldState.lightBulbRowIndex === newState.lightBulbRowIndex && oldState.foldingRanges === newState.foldingRanges && oldState.highlightActiveLineNumber === newState.highlightActiveLineNumber && oldState.lineNumbers === newState.lineNumbers && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && (!newState.highlightActiveLineNumber || getPrimaryCursorRowIndex(oldState.selections, oldState.primarySelectionIndex) === getPrimaryCursorRowIndex(newState.selections, newState.primarySelectionIndex))
 };
 const renderWidgets = {
   apply: renderWidgets$1,

package/dist/settings.json

@@ -53,6 +53,14 @@
     "type": 1,
     "value": "on"
   },
+  {
+    "category": "text-editor",
+    "description": "Controls whether the primary cursor line number is highlighted",
+    "heading": "Highlight Active Line Number",
+    "id": "editor.highlightActiveLineNumber",
+    "type": 3,
+    "value": true
+  },
   {
     "category": "text-editor",
     "description": "Controls whether the minimap is shown",

package/package.json

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