@lvce-editor/status-bar-worker 3.32.0 → 3.32.1

package/dist/statusBarWorkerMain.js

@@ -265,7 +265,7 @@ const {
   getCommandIds,
   getKeys,
   registerCommands,
-  set: set$8,
+  set: set$9,
   wrapCommand,
   wrapGetter,
   wrapSerialAsyncCommand} = create$a();
@@ -279,13 +279,19 @@ const create$9 = (uid, uri, x, y, width, height, platform, assetDir) => {
     statusBarItemsLeft: [],
     statusBarItemsRight: [],
     uid,
-    warningCount: 0
+    visibleStatusBarItemsLeft: [],
+    visibleStatusBarItemsRight: [],
+    warningCount: 0,
+    width
   };
-  set$8(uid, state, state);
+  set$9(uid, state, state);
 };
 
+const areItemsEqual = (left, right) => {
+  return left.length === right.length && left.every((item, index) => item === right[index]);
+};
 const isEqual = (oldState, newState) => {
-  return oldState.statusBarItemsLeft === newState.statusBarItemsLeft && oldState.statusBarItemsRight === newState.statusBarItemsRight;
+  return oldState.statusBarItemsLeft === newState.statusBarItemsLeft && oldState.statusBarItemsRight === newState.statusBarItemsRight && oldState.width === newState.width && areItemsEqual(oldState.visibleStatusBarItemsLeft, newState.visibleStatusBarItemsLeft) && areItemsEqual(oldState.visibleStatusBarItemsRight, newState.visibleStatusBarItemsRight);
 };
 
 const RenderItems = 4;
@@ -499,6 +505,7 @@ const TargetName = 'event.target.name';
 const ExtensionManagementWorker = 9006;
 const RendererProcess = 1670;
 const RendererWorker = 1;
+const TextMeasurementWorker = 7011;
 
 const SetDom2 = 'Viewlet.setDom2';
 const SetFocusContext = 'Viewlet.setFocusContext';
@@ -616,11 +623,11 @@ const getStatusBarVirtualDom = (statusBarItemsLeft, statusBarItemsRight) => {
 
 const renderItems = (oldState, newState) => {
   const {
-    statusBarItemsLeft,
-    statusBarItemsRight,
-    uid
+    uid,
+    visibleStatusBarItemsLeft,
+    visibleStatusBarItemsRight
   } = newState;
-  const dom = getStatusBarVirtualDom(statusBarItemsLeft, statusBarItemsRight);
+  const dom = getStatusBarVirtualDom(visibleStatusBarItemsLeft, visibleStatusBarItemsRight);
   return [SetDom2, uid, dom];
 };
 
@@ -658,10 +665,10 @@ const isRight = name => {
 const state$2 = {
   rpc: undefined
 };
-const set$7 = rpc => {
+const set$8 = rpc => {
   state$2.rpc = rpc;
 };
-const invoke$5 = (method, ...args) => {
+const invoke$6 = (method, ...args) => {
   const {
     rpc
   } = state$2;
@@ -674,16 +681,16 @@ const handleClickEditorStatus = async (name, status) => {
   }
   switch (name) {
     case EditorEndOfLine$1:
-      await invoke$5('QuickPick.openStatusBarPicker', 'end-of-line');
+      await invoke$6('QuickPick.openStatusBarPicker', 'end-of-line');
       return;
     case EditorIndentation:
-      await invoke$5('QuickPick.openStatusBarPicker', 'indentation');
+      await invoke$6('QuickPick.openStatusBarPicker', 'indentation');
       return;
     case EditorLanguage$1:
-      await invoke$5('QuickPick.openStatusBarPicker', 'language-mode');
+      await invoke$6('QuickPick.openStatusBarPicker', 'language-mode');
       return;
     case EditorPosition$1:
-      await invoke$5('QuickPick.openStatusBarPicker', 'go-to-line', status.line, status.column);
+      await invoke$6('QuickPick.openStatusBarPicker', 'go-to-line', status.line, status.column);
       return;
   }
 };
@@ -1800,7 +1807,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$6 = (id, rpc) => {
+const set$7 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$3 = id => {
@@ -1833,7 +1840,7 @@ const create = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$6(rpcId, mockRpc);
+      set$7(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1842,33 +1849,45 @@ const create = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$6(rpcId, rpc);
+      set$7(rpcId, rpc);
     }
   };
 };
 
+const {
+  invoke: invoke$5,
+  set: set$6
+} = create(ExtensionManagementWorker);
+
 const {
   invoke: invoke$4,
   set: set$5
-} = create(ExtensionManagementWorker);
+} = create(RendererProcess);
 
 const {
   invoke: invoke$3,
   set: set$4
-} = create(RendererProcess);
+} = create(TextMeasurementWorker);
+const measureTextWidths$1 = async (texts, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth) => {
+  return invoke$3('TextMeasurement.measureTextWidths', texts, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth);
+};
 
 const {
   invoke: invoke$2,
   invokeAndTransfer,
   set: set$3
 } = create(RendererWorker);
+const sendMessagePortToTextMeasurementWorker = async port => {
+  const command = 'TextMeasurement.handleMessagePort';
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToTextMeasurementWorker', port, command, 0);
+};
 const getPreference = async key => {
   return await invoke$2('Preferences.get', key);
 };
 
 const handleClickExtensionStatusBarItem = async name => {
   try {
-    await invoke$4('Extensions.executeCommand', name);
+    await invoke$5('Extensions.executeCommand', name);
   } catch (error) {
     console.error(new VError(error, `Failed to execute status bar command: ${name}`));
   }
@@ -1929,7 +1948,7 @@ const show2 = async (uid, menuId, x, y, args) => {
 
 const getStatusBarItemContextMenuItems = async (extensionId, providerId) => {
   try {
-    return await invoke$4('Extensions.getStatusBarItemContextMenuItems', extensionId, providerId);
+    return await invoke$5('Extensions.getStatusBarItemContextMenuItems', extensionId, providerId);
   } catch {
     return [];
   }
@@ -2197,6 +2216,81 @@ const applyRender = (oldState, newState, diffResult) => {
   return commands;
 };
 
+const fontSize = 12;
+const fontFamily = 'system-ui, Ubuntu, Droid Sans, sans-serif';
+const itemPaddingAndMargin = 16;
+const iconWidth = 20;
+const horizontalGroupPadding = 14;
+const measuredWidths = new WeakMap();
+const fallbackTextWidth = 150;
+const measureTextWidths = async values => {
+  if (values.length === 0) {
+    return [];
+  }
+  try {
+    return await measureTextWidths$1(values, 400, fontSize, fontFamily, 0, false, 0);
+  } catch {
+    return values.map(() => fallbackTextWidth);
+  }
+};
+const getItemWidths = async items => {
+  const unmeasuredItems = [...new Set(items.filter(item => !measuredWidths.has(item)))];
+  const textElements = unmeasuredItems.flatMap(item => item.elements.filter(element => element.type === 'text'));
+  const textWidths = await measureTextWidths(textElements.map(element => element.value));
+  let textIndex = 0;
+  for (const item of unmeasuredItems) {
+    let itemWidth = itemPaddingAndMargin;
+    for (const element of item.elements) {
+      if (element.type === 'icon') {
+        itemWidth += iconWidth;
+      } else {
+        itemWidth += textWidths[textIndex];
+        textIndex++;
+      }
+    }
+    measuredWidths.set(item, Promise.resolve(itemWidth));
+  }
+  return Promise.all(items.map(item => measuredWidths.get(item)));
+};
+const fitItems = (items, widths, availableWidth) => {
+  const visible = [];
+  let usedWidth = 0;
+  for (let i = 0; i < items.length; i++) {
+    const itemWidth = widths[i];
+    if (itemWidth <= availableWidth - usedWidth) {
+      visible.push(items[i]);
+      usedWidth += itemWidth;
+    }
+  }
+  return {
+    items: visible,
+    usedWidth
+  };
+};
+const equalItems = (left, right) => {
+  return left.length === right.length && left.every((item, index) => item === right[index]);
+};
+const getVisibleStatusBarItems = async state => {
+  const {
+    statusBarItemsLeft,
+    statusBarItemsRight,
+    visibleStatusBarItemsLeft,
+    visibleStatusBarItemsRight,
+    width
+  } = state;
+  const innerWidth = Math.max(0, width - horizontalGroupPadding);
+  const itemWidths = await getItemWidths([...statusBarItemsLeft, ...statusBarItemsRight]);
+  const leftWidths = itemWidths.slice(0, statusBarItemsLeft.length);
+  const rightWidths = itemWidths.slice(statusBarItemsLeft.length);
+  const right = fitItems(statusBarItemsRight, rightWidths, innerWidth);
+  const left = fitItems(statusBarItemsLeft, leftWidths, innerWidth - right.usedWidth);
+  return {
+    ...state,
+    visibleStatusBarItemsLeft: equalItems(visibleStatusBarItemsLeft, left.items) ? visibleStatusBarItemsLeft : left.items,
+    visibleStatusBarItemsRight: equalItems(visibleStatusBarItemsRight, right.items) ? visibleStatusBarItemsRight : right.items
+  };
+};
+
 const state = {
   connected: false
 };
@@ -2207,10 +2301,10 @@ const isConnected = () => {
   return connected;
 };
 const invoke = (method, ...params) => {
-  return invoke$3(method, ...params);
+  return invoke$4(method, ...params);
 };
 const set$1 = rpc => {
-  set$4(rpc);
+  set$5(rpc);
   state.connected = true;
 };
 
@@ -2220,12 +2314,29 @@ const renderDirect = async (uid, commands) => {
   const transactionId = await invoke('Viewlet.queueCommands', uid, rendererProcessCommands);
   return [...rendererWorkerCommands, ['Viewlet.commitPending', uid, transactionId]];
 };
-const render2 = (uid, diffResult) => {
+const render2 = async (uid, _diffResult) => {
+  let current = get$5(uid);
+  let {
+    newState
+  } = current;
+  while (true) {
+    const measuredState = await getVisibleStatusBarItems(newState);
+    const latest = get$5(uid);
+    const {
+      newState: latestState
+    } = latest;
+    if (latestState === newState) {
+      current = latest;
+      newState = measuredState;
+      set$9(uid, current.oldState, newState);
+      break;
+    }
+    newState = latestState;
+  }
+  const diffResult = [...new Set([..._diffResult, ...diff(current.oldState, newState)])];
   const {
-    newState,
     oldState
-  } = get$5(uid);
-  set$8(uid, newState, newState);
+  } = current;
   const commands = applyRender(oldState, newState, diffResult);
   if (!isConnected()) {
     return commands;
@@ -2272,7 +2383,7 @@ const handleEditorStatusChangedAll = async update => {
     if (newState === newerState || oldState === newerState) {
       continue;
     }
-    set$8(uid, oldState, newerState);
+    set$9(uid, oldState, newerState);
     changedUids.push(uid);
   }
   await Promise.all(changedUids.map(renderOutOfBand));
@@ -2313,7 +2424,7 @@ const handleEditorStatusVisibilityChangedAll = async visible => {
     if (newState === newerState || oldState === newerState) {
       continue;
     }
-    set$8(uid, oldState, newerState);
+    set$9(uid, oldState, newerState);
     changedUids.push(uid);
   }
   await Promise.all(changedUids.map(renderOutOfBand));
@@ -2400,8 +2511,8 @@ const getBuiltinStatusBarItems = async (errorCount, warningCount, {
 };
 
 const getExtensionStatusBarItems = async (assetDir, platform) => {
-  await invoke$4('Extensions.activateByEvent', 'onStatusBarItem', assetDir, platform);
-  return invoke$4('Extensions.getStatusBarItems');
+  await invoke$5('Extensions.activateByEvent', 'onStatusBarItem', assetDir, platform);
+  return invoke$5('Extensions.getStatusBarItems');
 };
 
 const toStatusBarItem = uiStatusBarItem => {
@@ -2479,7 +2590,7 @@ const toUiStatusBarItems = statusBarItems => {
 
 const getNotificationCount = async () => {
   try {
-    return await invoke$4('Extensions.getNotificationCount');
+    return await invoke$5('Extensions.getNotificationCount');
   } catch {
     return 0;
   }
@@ -2558,7 +2669,7 @@ const handleExtensionManagementChange = async () => {
     // Loading and other updates can finish while the provider query is pending.
     // Only replace the extension items; retain the current lifecycle and render baseline.
     const current = get$5(uid);
-    set$8(uid, current.oldState, {
+    set$9(uid, current.oldState, {
       ...current.newState,
       statusBarItemsLeft: newerState.statusBarItemsLeft
     });
@@ -2603,7 +2714,7 @@ const handleNotificationCountChangedAll = async count => {
     if (newState === newerState || oldState === newerState) {
       continue;
     }
-    set$8(uid, oldState, newerState);
+    set$9(uid, oldState, newerState);
     await renderOutOfBand(uid);
   }
 };
@@ -2618,7 +2729,7 @@ const handleExtensionManagementMessagePort = async port => {
     commandMap: commandMap$1,
     messagePort: port
   });
-  set$5(rpc);
+  set$6(rpc);
 };
 
 const supportsEditorStatusDeltas = () => true;
@@ -2672,7 +2783,7 @@ const handleWorkspaceChange = async state => {
     assetDir,
     platform
   } = state;
-  await invoke$4('Extensions.activateByEvent', 'onStatusBarItem', assetDir, platform);
+  await invoke$5('Extensions.activateByEvent', 'onStatusBarItem', assetDir, platform);
   return state;
 };
 
@@ -2910,7 +3021,7 @@ const initializeQuickPickWorker = async () => {
       await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToQuickPickWorker', port, 'QuickPick.handleStatusBarMessagePort', 0);
     }
   });
-  set$7(rpc);
+  set$8(rpc);
 };
 
 const initializeRenderWorker = async () => {
@@ -2920,9 +3031,21 @@ const initializeRenderWorker = async () => {
   set$3(rpc);
 };
 
+const send = port => {
+  // @ts-ignore
+  return sendMessagePortToTextMeasurementWorker(port);
+};
+const initializeTextMeasurementWorkerRpc = async () => {
+  const rpc = await create$2({
+    commandMap: {},
+    send
+  });
+  set$4(rpc);
+};
+
 const listen = async () => {
   registerCommands(commandMap);
-  await Promise.all([initializeRenderWorker(), initializeQuickPickWorker(), initializeMenuWorker()]);
+  await Promise.all([initializeRenderWorker(), initializeQuickPickWorker(), initializeMenuWorker(), initializeTextMeasurementWorkerRpc()]);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/status-bar-worker",
-  "version": "3.32.0",
+  "version": "3.32.1",
   "description": "Status Bar Worker",
   "repository": {
     "type": "git",