@lvce-editor/editor-worker 19.33.1 → 19.35.0

package/dist/editorWorkerMain.js

@@ -3482,6 +3482,7 @@ const getUrlAtOffset = (editor, offset) => {
 };
 
 const EditorChange = 1;
+const EditorSelection$1 = 2;
 
 const state$9 = Object.create(null);
 
@@ -4544,6 +4545,7 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
     diagnosticsEnabled: false,
     differences: [],
     embeds: [],
+    endOfLineDecorations: [],
     finalDeltaY: 0,
     finalY: 0,
     focus: 0,
@@ -4627,6 +4629,7 @@ const emptyEditor = {
   diagnostics: [],
   differences: [],
   embeds: [],
+  endOfLineDecorations: [],
   focused: false,
   foldingRanges: [],
   hasListener: false,
@@ -4791,6 +4794,7 @@ const createEditor = async ({
     diagnostics: [],
     diagnosticsEnabled,
     differences: [],
+    endOfLineDecorations: [],
     finalDeltaY: 0,
     finalY: 0,
     focused: false,
@@ -5064,6 +5068,36 @@ const dispose$2 = uid => {
   pendingSaves.delete(uid);
 };
 
+const getEditorStatus = editor => {
+  const primarySelectionIndex = editor.primarySelectionIndex || 0;
+  const rowIndex = editor.selections[primarySelectionIndex + 2] || 0;
+  const columnIndex = editor.selections[primarySelectionIndex + 3] || 0;
+  return {
+    column: columnIndex + 1,
+    encoding: 'utf8',
+    languageId: editor.languageId,
+    line: rowIndex + 1,
+    tabSize: editor.tabSize
+  };
+};
+
+const equals = (oldStatus, newStatus) => {
+  return oldStatus.column === newStatus.column && oldStatus.encoding === newStatus.encoding && oldStatus.languageId === newStatus.languageId && oldStatus.line === newStatus.line && oldStatus.tabSize === newStatus.tabSize;
+};
+const notifyEditorStatusChange = async (oldEditor, newEditor) => {
+  if (newEditor.initial || !newEditor.focused) {
+    return;
+  }
+  const newStatus = getEditorStatus(newEditor);
+  if (!oldEditor.initial && oldEditor.focused && equals(getEditorStatus(oldEditor), newStatus)) {
+    return;
+  }
+  await notifyListeners(EditorSelection$1, 'StatusBar.handleEditorStatusChanged', newStatus);
+};
+const notifyEditorStatusCleared = async () => {
+  await notifyListeners(EditorSelection$1, 'StatusBar.handleEditorStatusChanged', undefined);
+};
+
 const addWidget$1 = widget => {
   const module = get$7(widget.id);
   if (!module) {
@@ -5157,6 +5191,9 @@ const disposeEditor = async editorUid => {
   dispose$1(editorUid);
   dispose$2(editorUid);
   dispose$3(editorUid);
+  if (getKeys$2().length === 0) {
+    await notifyEditorStatusCleared();
+  }
   return commands;
 };
 
@@ -7856,6 +7893,43 @@ const getClickHandler = modifier => {
   }
 };
 
+const isProviderDecoration = value => {
+  return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+};
+const getProviderDecorations = (results, rowIndex) => {
+  if (!Array.isArray(results)) {
+    return [];
+  }
+  const decorations = [];
+  for (const result of results) {
+    if (!Array.isArray(result)) {
+      continue;
+    }
+    for (const decoration of result) {
+      if (isProviderDecoration(decoration) && typeof decoration.text === 'string') {
+        decorations.push({
+          rowIndex,
+          text: decoration.text
+        });
+      }
+    }
+  }
+  return decorations;
+};
+const getEditorLineDecorations = async (editor, rowIndex) => {
+  const textDocument = {
+    languageId: editor.languageId,
+    text: getText$1(editor),
+    uri: editor.uri
+  };
+  try {
+    const results = await invoke$d('Extensions.executeProvidersByEvent', 'onEditorLineDecoration', 'ExtensionApi.executeEditorLineDecorationProvider', textDocument, rowIndex);
+    return getProviderDecorations(results, rowIndex);
+  } catch {
+    return [];
+  }
+};
+
 const handleClickAtPosition = async (editor, modifier, rowIndex, columnIndex) => {
   object(editor);
   number(modifier);
@@ -7866,7 +7940,11 @@ const handleClickAtPosition = async (editor, modifier, rowIndex, columnIndex) =>
     columnIndex,
     rowIndex
   });
-  return newEditor;
+  const endOfLineDecorations = await getEditorLineDecorations(newEditor, rowIndex);
+  return {
+    ...newEditor,
+    endOfLineDecorations
+  };
 };
 
 const Editor = 3;
@@ -11583,6 +11661,7 @@ const CompletionDetailContent = 'CompletionDetailContent';
 const Diagnostic = 'Diagnostic';
 const EditorCursor = 'EditorCursor';
 const EditorHoverDiagnosticOnly = 'EditorHoverDiagnosticOnly';
+const EditorLineDecoration = 'EditorLineDecoration';
 const EditorRow = 'EditorRow';
 const EditorRowHighlighted = 'EditorRowHighlighted';
 const EditorSelection = 'EditorSelection';
@@ -13271,6 +13350,12 @@ ${editorSelector} .EditorRow {
   height: var(--EditorRowHeight);
   line-height: var(--EditorRowHeight);
 }
+${editorSelector} .EditorLineDecoration {
+  color: var(--EditorInlineBlameForeground, rgba(255, 255, 255, 0.5));
+  font-style: italic;
+  margin-left: 2em;
+  user-select: none;
+}
 ${editorSelector} .R{background-color:#add6ff40}
 ${editorSelector} .ScrollBarThumbVertical {
   height: var(--ScrollBarHeight);
@@ -13689,17 +13774,24 @@ const getEditorDiagnosticsVirtualDom = diagnostics => {
   }, ...diagnosticsDom];
 };
 
-const getEditorRowsVirtualDom$1 = (textInfos, differences, lineNumbers = true, highlightedLine = -1) => {
+const editorLineDecorationNode = {
+  childCount: 1,
+  className: EditorLineDecoration,
+  type: Span
+};
+const getEditorRowsVirtualDom$1 = (textInfos, differences, lineNumbers = true, highlightedLine = -1, visibleLineIndices = [], endOfLineDecorations = []) => {
   const dom = [];
   for (let i = 0; i < textInfos.length; i++) {
     const textInfo = textInfos[i];
     const difference = differences[i];
+    const rowIndex = visibleLineIndices[i] ?? i;
+    const rowDecorations = endOfLineDecorations.filter(decoration => decoration.rowIndex === rowIndex);
     let className = EditorRow;
     if (i === highlightedLine) {
       className = mergeClassNames(className, EditorRowHighlighted);
     }
     dom.push({
-      childCount: textInfo.length / 2,
+      childCount: textInfo.length / 2 + rowDecorations.length,
       className,
       translate: px(difference),
       type: Div
@@ -13713,12 +13805,15 @@ const getEditorRowsVirtualDom$1 = (textInfos, differences, lineNumbers = true, h
         type: Span
       }, text(tokenText));
     }
+    for (const decoration of rowDecorations) {
+      dom.push(editorLineDecorationNode, text(decoration.text));
+    }
   }
   return dom;
 };
 
-const getEditorRowsVirtualDom = (textInfos, differences, lineNumbers = true, highlightedLine = -1) => {
-  const rowsDom = getEditorRowsVirtualDom$1(textInfos, differences, lineNumbers, highlightedLine);
+const getEditorRowsVirtualDom = (textInfos, differences, lineNumbers = true, highlightedLine = -1, visibleLineIndices = [], endOfLineDecorations = []) => {
+  const rowsDom = getEditorRowsVirtualDom$1(textInfos, differences, lineNumbers, highlightedLine, visibleLineIndices, endOfLineDecorations);
   return [{
     childCount: textInfos.length,
     className: 'EditorRows',
@@ -14012,6 +14107,7 @@ const renderLines = {
     }
     const {
       differences,
+      endOfLineDecorations,
       textInfos
     } = newState;
     newState.differences = differences;
@@ -14020,10 +14116,10 @@ const renderLines = {
       visibleLineIndices
     } = newState;
     const relativeLine = visibleLineIndices.indexOf(highlightedLine);
-    const dom = getEditorRowsVirtualDom$1(textInfos, differences, true, relativeLine);
+    const dom = getEditorRowsVirtualDom$1(textInfos, differences, true, relativeLine, visibleLineIndices, endOfLineDecorations);
     return [/* method */'setText', dom];
   },
-  isEqual: (oldState, newState) => oldState.lines === newState.lines && oldState.foldingRanges === newState.foldingRanges && oldState.tokenizerId === newState.tokenizerId && oldState.minLineY === newState.minLineY && oldState.decorations === newState.decorations && oldState.embeds === newState.embeds && oldState.deltaX === newState.deltaX && oldState.width === newState.width && oldState.highlightedLine === newState.highlightedLine && oldState.debugEnabled === newState.debugEnabled
+  isEqual: (oldState, newState) => oldState.lines === newState.lines && oldState.foldingRanges === newState.foldingRanges && oldState.tokenizerId === newState.tokenizerId && oldState.minLineY === newState.minLineY && oldState.decorations === newState.decorations && oldState.embeds === newState.embeds && oldState.endOfLineDecorations === newState.endOfLineDecorations && oldState.deltaX === newState.deltaX && oldState.width === newState.width && oldState.highlightedLine === newState.highlightedLine && oldState.debugEnabled === newState.debugEnabled
 };
 const renderSelections = {
   apply: (oldState, newState) => {
@@ -14468,6 +14564,7 @@ const wrapCommand = (fn, preservesTypingCoalescing = false) => async (uid, ...ar
       }
       set$8(uid, state, finalEditor);
     }
+    await notifyEditorStatusChange(state, finalEditor);
     if (!initial && uri === finalEditor.uri && (lines !== finalEditor.lines || modified !== finalEditor.modified || redoStack !== finalEditor.redoStack || undoStack !== finalEditor.undoStack)) {
       for (const key of getKeys$2()) {
         const otherUid = Number(key);

package/package.json

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