@lvce-editor/editor-worker 19.39.0 → 19.41.0

package/dist/editorWorkerMain.js

@@ -1228,7 +1228,7 @@ const Article = 27;
 const Aside = 28;
 const Footer = 29;
 const Header = 30;
-const Nav = 40;
+const Nav$1 = 40;
 const Section = 41;
 const Search = 42;
 const Dd = 43;
@@ -1332,7 +1332,7 @@ const VirtualDomElements = {
   Line,
   Main,
   Meta,
-  Nav,
+  Nav: Nav$1,
   Ol,
   Option,
   P,
@@ -3567,8 +3567,9 @@ const resize = (state, dimensions, columnWidth = state.columnWidth) => {
   const x = dimensions.x ?? state.x;
   const y = dimensions.y ?? state.y;
   const outerWidth = dimensions.width ?? state.outerWidth ?? state.width;
+  const outerHeight = dimensions.height ?? state.outerHeight ?? state.height;
   const width$1 = Math.max(outerWidth - (state.minimapEnabled ? width : 0), 0);
-  const height = dimensions.height ?? state.height;
+  const height = Math.max(outerHeight - (state.breadcrumbsEnabled ? 22 : 0), 0);
   const numberOfVisibleLines = Math.floor(height / state.itemHeight);
   if (!('foldingRanges' in state)) {
     const total = state.lines.length;
@@ -3592,6 +3593,9 @@ const resize = (state, dimensions, columnWidth = state.columnWidth) => {
       ...('outerWidth' in state && {
         outerWidth
       }),
+      ...('outerHeight' in state && {
+        outerHeight
+      }),
       scrollBarHeight,
       width: width$1,
       x,
@@ -3606,6 +3610,9 @@ const resize = (state, dimensions, columnWidth = state.columnWidth) => {
     ...('outerWidth' in state && {
       outerWidth
     }),
+    ...('outerHeight' in state && {
+      outerHeight
+    }),
     width: width$1,
     x,
     y
@@ -4666,6 +4673,7 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
   const editor = {
     additionalFocus: 0,
     assetDir,
+    breadcrumbsEnabled: false,
     breakPoints: [],
     charWidth: 0,
     columnWidth: 0,
@@ -4681,6 +4689,7 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
     diagnostics: [],
     diagnosticsEnabled: false,
     differences: [],
+    documentSymbols: [],
     embeds: [],
     endOfLineDecorations: [],
     finalDeltaY: 0,
@@ -4725,6 +4734,7 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
     modified: false,
     numberOfLines: 0,
     numberOfVisibleLines: 0,
+    outerHeight: height,
     outerWidth: width,
     platform,
     primarySelectionIndex: 0,
@@ -4755,6 +4765,7 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
     widgetRevision: 0,
     widgets: [],
     width,
+    workspaceUri: '',
     x,
     y
   };
@@ -4762,6 +4773,7 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
 };
 
 const emptyEditor = {
+  breadcrumbsEnabled: false,
   breakPoints: [],
   cursorInfos: [],
   debugEnabled: false,
@@ -4770,6 +4782,7 @@ const emptyEditor = {
   deltaY: 0,
   diagnostics: [],
   differences: [],
+  documentSymbols: [],
   embeds: [],
   endOfLineDecorations: [],
   focused: false,
@@ -4789,6 +4802,7 @@ const emptyEditor = {
   minimapLines: [],
   minimapRevision: 0,
   minLineY: 0,
+  outerHeight: 0,
   outerWidth: 0,
   redoStack: [],
   scrollBarHeight: 0,
@@ -4808,6 +4822,7 @@ const emptyEditor = {
   uri: '',
   visibleLineIndices: [],
   width: 0,
+  workspaceUri: '',
   x: 0,
   y: 0
 };
@@ -5139,7 +5154,7 @@ const isEqual$3 = (oldState, newState) => {
 };
 
 const isEqual$2 = (oldState, newState) => {
-  return oldState.breakPoints === newState.breakPoints && oldState.cursorInfos === newState.cursorInfos && oldState.diagnostics === newState.diagnostics && oldState.endOfLineDecorations === newState.endOfLineDecorations && 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;
+  return oldState.breadcrumbsEnabled === newState.breadcrumbsEnabled && oldState.breakPoints === newState.breakPoints && oldState.cursorInfos === newState.cursorInfos && oldState.diagnostics === newState.diagnostics && oldState.documentSymbols === newState.documentSymbols && oldState.endOfLineDecorations === newState.endOfLineDecorations && 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) => {
@@ -11951,6 +11966,7 @@ const Div = 4;
 const Input = 6;
 const Span = 8;
 const Text = 12;
+const Nav = 40;
 const TextArea = 62;
 
 const text = data => {
@@ -13015,6 +13031,21 @@ const handleMessagePort = async (port, rpcId) => {
   }
 };
 
+const getDocumentSymbols = async editor => {
+  try {
+    const result = await execute({
+      args: [],
+      editor,
+      kind: 'document symbol',
+      method: 'provideDocumentSymbols',
+      noProviderFoundResult: []
+    });
+    return Array.isArray(result) ? result : [];
+  } catch {
+    return [];
+  }
+};
+
 const kLineHeight = 'editor.lineHeight';
 const kFontSize = 'editor.fontSize';
 const kFontFamily = 'editor.fontFamily';
@@ -13028,6 +13059,7 @@ const kAutoClosingBrackets = 'editor.autoclosingBrackets';
 const kFontWeight = 'editor.fontWeight';
 const kHover = 'editor.hover';
 const kMinimapEnabled = 'editor.minimap.enabled';
+const kBreadcrumbsEnabled = 'breadcrumbs.enabled';
 const isAutoClosingBracketsEnabled = async () => {
   return Boolean(await get$3(kAutoClosingBrackets));
 };
@@ -13076,10 +13108,14 @@ const getFontWeight = async () => {
 const getMinimapEnabled = async () => {
   return (await get$3(kMinimapEnabled)) ?? false;
 };
+const getBreadcrumbsEnabled = async () => {
+  return (await get$3(kBreadcrumbsEnabled)) ?? false;
+};
 
 const getEditorPreferences = async () => {
-  const [diagnosticsEnabled$1, fontFamily, fontSize, fontWeight, hoverEnabled, isAutoClosingBracketsEnabled$1, isAutoClosingQuotesEnabled$1, isAutoClosingTagsEnabled$1, isQuickSuggestionsEnabled$1, lineNumbers, rowHeight, tabSize, letterSpacing, completionTriggerCharacters, minimapEnabled] = await Promise.all([diagnosticsEnabled(), getFontFamily(), getFontSize(), getFontWeight(), getHoverEnabled(), isAutoClosingBracketsEnabled(), isAutoClosingQuotesEnabled(), isAutoClosingTagsEnabled(), isQuickSuggestionsEnabled(), getLineNumbers(), getRowHeight(), getTabSize(), getLetterSpacing(), getCompletionTriggerCharacters(), getMinimapEnabled()]);
+  const [diagnosticsEnabled$1, fontFamily, fontSize, fontWeight, hoverEnabled, isAutoClosingBracketsEnabled$1, isAutoClosingQuotesEnabled$1, isAutoClosingTagsEnabled$1, isQuickSuggestionsEnabled$1, lineNumbers, rowHeight, tabSize, letterSpacing, completionTriggerCharacters, minimapEnabled, breadcrumbsEnabled] = await Promise.all([diagnosticsEnabled(), getFontFamily(), getFontSize(), getFontWeight(), getHoverEnabled(), isAutoClosingBracketsEnabled(), isAutoClosingQuotesEnabled(), isAutoClosingTagsEnabled(), isQuickSuggestionsEnabled(), getLineNumbers(), getRowHeight(), getTabSize(), getLetterSpacing(), getCompletionTriggerCharacters(), getMinimapEnabled(), getBreadcrumbsEnabled()]);
   return {
+    breadcrumbsEnabled,
     completionTriggerCharacters,
     diagnosticsEnabled: diagnosticsEnabled$1,
     fontFamily,
@@ -13098,9 +13134,17 @@ const getEditorPreferences = async () => {
   };
 };
 
+const getWorkspaceUri$1 = async () => {
+  try {
+    return await invoke$a('Workspace.getPath');
+  } catch {
+    return '';
+  }
+};
 const handleSettingsChanged = async state => {
   const editorPreferences = await getEditorPreferences();
   const {
+    breadcrumbsEnabled,
     diagnosticsEnabled,
     fontFamily,
     fontSize,
@@ -13122,7 +13166,19 @@ const handleSettingsChanged = async state => {
     minimapRevision: (state.minimapRevision || 0) + (minimapEnabled ? 1 : 0),
     visualDecorations: diagnosticsEnabled ? state.visualDecorations : []
   };
-  return resize(editorWithUpdatedSettings, {}, charWidth);
+  let documentSymbols = state.documentSymbols || [];
+  let workspaceUri = state.workspaceUri || '';
+  if (!breadcrumbsEnabled) {
+    documentSymbols = [];
+    workspaceUri = '';
+  } else if (!state.breadcrumbsEnabled) {
+    [documentSymbols, workspaceUri] = await Promise.all([getDocumentSymbols(editorWithUpdatedSettings), getWorkspaceUri$1()]);
+  }
+  return resize({
+    ...editorWithUpdatedSettings,
+    documentSymbols,
+    workspaceUri
+  }, {}, charWidth);
 };
 
 const applyTabCompletion = (editor, result) => {
@@ -13341,6 +13397,13 @@ const intialize = async (syntaxHighlightingEnabled, syncIncremental) => {
   await initializeSyntaxHighlighting(syntaxHighlightingEnabled, syncIncremental);
 };
 
+const getWorkspaceUri = async () => {
+  try {
+    return await invoke$a('Workspace.getPath');
+  } catch {
+    return '';
+  }
+};
 const getTokenizePath = (languages, languageId) => {
   for (const language of languages) {
     if (language?.id === languageId && language.tokenize) {
@@ -13387,6 +13450,7 @@ const loadContent = async (state, savedState) => {
     y
   } = state;
   const {
+    breadcrumbsEnabled,
     completionTriggerCharacters,
     diagnosticsEnabled,
     fontFamily,
@@ -13415,6 +13479,7 @@ const loadContent = async (state, savedState) => {
   set$3(newTokenizerId, tokenizer);
   const newEditor0 = {
     ...state,
+    breadcrumbsEnabled,
     charWidth,
     completionTriggerCharacters,
     diagnosticsEnabled,
@@ -13473,13 +13538,23 @@ const loadContent = async (state, savedState) => {
     ...newEditor3,
     decorations: linkDecorations
   };
+  let documentSymbols = state.documentSymbols || [];
+  let workspaceUri = state.workspaceUri || '';
+  if (breadcrumbsEnabled) {
+    [documentSymbols, workspaceUri] = await Promise.all([getDocumentSymbols(newEditor3WithLinks), getWorkspaceUri()]);
+  }
+  const newEditor3WithBreadcrumbs = {
+    ...newEditor3WithLinks,
+    documentSymbols,
+    workspaceUri
+  };
   const syncIncremental = getEnabled();
   const {
     differences,
     textInfos
-  } = await getVisible$1(newEditor3WithLinks, syncIncremental);
+  } = await getVisible$1(newEditor3WithBreadcrumbs, syncIncremental);
   const newEditor4 = {
-    ...newEditor3WithLinks,
+    ...newEditor3WithBreadcrumbs,
     differences,
     focus: FocusEditorText$1,
     focused: true,
@@ -13925,6 +14000,92 @@ const Button = 'button';
 const Code = 'code';
 const TextBox = 'textbox';
 
+const getPathname = uri => {
+  try {
+    return decodeURIComponent(new URL(uri).pathname);
+  } catch {
+    return decodeURIComponent(uri);
+  }
+};
+const getFileBreadcrumbs = (uri, workspaceUri) => {
+  const path = getPathname(uri);
+  const workspacePath = workspaceUri ? getPathname(workspaceUri).replace(/\/$/, '') : '';
+  const relativePath = workspacePath && (path === workspacePath || path.startsWith(`${workspacePath}/`)) ? path.slice(workspacePath.length + 1) : path.split('/').at(-1) || path;
+  return relativePath.split('/').filter(Boolean).map(label => ({
+    kind: 'file',
+    label
+  }));
+};
+const containsOffset = (symbol, offset) => {
+  return Number.isFinite(symbol.startOffset) && Number.isFinite(symbol.endOffset) && symbol.startOffset <= offset && offset <= symbol.endOffset;
+};
+const getSymbolBreadcrumbs = (symbols, offset) => {
+  for (const symbol of symbols) {
+    if (!symbol || typeof symbol.name !== 'string' || !containsOffset(symbol, offset)) {
+      continue;
+    }
+    return [{
+      kind: 'symbol',
+      label: symbol.name,
+      symbolKind: symbol.kind
+    }, ...getSymbolBreadcrumbs(Array.isArray(symbol.children) ? symbol.children : [], offset)];
+  }
+  return [];
+};
+const getEditorBreadcrumbs = state => {
+  const {
+    breadcrumbsEnabled,
+    documentSymbols,
+    lines,
+    primarySelectionIndex,
+    selections,
+    uri,
+    workspaceUri
+  } = state;
+  if (!breadcrumbsEnabled) {
+    return [];
+  }
+  const selectionIndex = primarySelectionIndex || 0;
+  const rowIndex = selections[selectionIndex + 2] ?? selections[selectionIndex] ?? 0;
+  const columnIndex = selections[selectionIndex + 3] ?? selections[selectionIndex + 1] ?? 0;
+  const offset = offsetAt({
+    lines
+  }, rowIndex, columnIndex);
+  return [...getFileBreadcrumbs(uri, workspaceUri || ''), ...getSymbolBreadcrumbs(documentSymbols || [], offset)];
+};
+
+const separator = {
+  ariaHidden: True,
+  childCount: 0,
+  className: mergeClassNames('EditorBreadcrumbSeparator', 'MaskIcon', 'MaskIconChevronRight'),
+  type: Span
+};
+const getEditorBreadcrumbsVirtualDom = state => {
+  const breadcrumbs = getEditorBreadcrumbs(state);
+  const children = [];
+  for (let index = 0; index < breadcrumbs.length; index++) {
+    const breadcrumb = breadcrumbs[index];
+    if (index > 0) {
+      children.push(separator);
+    }
+    children.push({
+      childCount: 1,
+      className: mergeClassNames('EditorBreadcrumb', breadcrumb.kind === 'symbol' ? 'EditorBreadcrumbSymbol' : 'EditorBreadcrumbFile'),
+      'data-kind': breadcrumb.kind,
+      ...(breadcrumb.symbolKind !== undefined && {
+        'data-symbolKind': breadcrumb.symbolKind
+      }),
+      type: Span
+    }, text(breadcrumb.label));
+  }
+  return [{
+    ariaLabel: 'Breadcrumbs',
+    childCount: children.length,
+    className: 'EditorBreadcrumbs',
+    type: Nav
+  }, ...children];
+};
+
 const editorInputNode = {
   childCount: 1,
   className: 'EditorInput',
@@ -14256,25 +14417,32 @@ const getMinimapVirtualDom = (minimapEnabled, minimapLines, minLineY) => {
   }];
 };
 const getEditorVirtualDom = ({
+  breadcrumbsEnabled = false,
   breakPoints = [],
   cursorInfos = [],
   diagnostics = [],
   differences,
+  documentSymbols = [],
   endOfLineDecorations = [],
   gutterInfos = [],
   highlightedLine = -1,
   lightBulbRowIndex = -1,
   lineNumbers = true,
+  lines = [],
   loadError = '',
   maxLineY = 0,
   minimapEnabled = false,
   minimapLines = [],
   minLineY = 0,
+  primarySelectionIndex = 0,
   scrollBarDiagnostics = [],
   selectionInfos = [],
+  selections = new Uint32Array(),
   textInfos,
   uid,
-  visibleLineIndices
+  uri = '',
+  visibleLineIndices,
+  workspaceUri = ''
 }) => {
   if (loadError) {
     return [{
@@ -14289,14 +14457,23 @@ const getEditorVirtualDom = ({
   const showGutter = lineNumbers || breakPoints.length > 0 || lightBulbRowIndex >= 0;
   const gutterDom = showGutter ? getEditorGutterVirtualDom(visibleGutterInfos) : [];
   const minimapDom = getMinimapVirtualDom(minimapEnabled, minimapLines, minLineY);
+  const breadcrumbsDom = breadcrumbsEnabled ? getEditorBreadcrumbsVirtualDom({
+    breadcrumbsEnabled,
+    documentSymbols,
+    lines,
+    primarySelectionIndex,
+    selections,
+    uri,
+    workspaceUri
+  }) : [];
   return [{
-    childCount: (showGutter ? 2 : 1) + (minimapEnabled ? 1 : 0),
+    childCount: (showGutter ? 2 : 1) + (minimapEnabled ? 1 : 0) + (breadcrumbsEnabled ? 1 : 0),
     className: mergeClassNames('Viewlet', 'Editor'),
     'data-uid': uid,
     onContextMenu: HandleContextMenu,
     role: Code,
     type: Div
-  }, ...gutterDom, ...getEditorContentVirtualDom({
+  }, ...breadcrumbsDom, ...gutterDom, ...getEditorContentVirtualDom({
     cursorInfos,
     diagnostics,
     differences,

package/package.json

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