@lvce-editor/status-bar-worker 3.18.0 → 3.20.0

package/dist/statusBarWorkerMain.js

@@ -119,11 +119,11 @@ const terminate = () => {
 };
 
 const {
-  get: get$4,
+  get: get$5,
   getCommandIds,
   getKeys,
   registerCommands,
-  set: set$6,
+  set: set$7,
   wrapCommand,
   wrapGetter
 } = create$8();
@@ -139,7 +139,7 @@ const create$7 = (uid, uri, x, y, width, height, platform, assetDir) => {
     uid,
     warningCount: 0
   };
-  set$6(uid, state, state);
+  set$7(uid, state, state);
 };
 
 const isEqual = (oldState, newState) => {
@@ -167,7 +167,7 @@ const diff2 = uid => {
   const {
     newState,
     oldState
-  } = get$4(uid);
+  } = get$5(uid);
   const result = diff(oldState, newState);
   return result;
 };
@@ -721,7 +721,7 @@ const execute = (command, ...args) => {
 
 const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const get$3 = id => {
+const get$4 = id => {
   return callbacks[id];
 };
 const remove$1 = id => {
@@ -911,7 +911,7 @@ const warn = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$3(id);
+  const fn = get$4(id);
   if (!fn) {
     console.log(response);
     warn(`callback ${id} may already be disposed`);
@@ -1244,10 +1244,10 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$5 = (id, rpc) => {
+const set$6 = (id, rpc) => {
   rpcs[id] = rpc;
 };
-const get$2 = id => {
+const get$3 = id => {
   return rpcs[id];
 };
 const remove = id => {
@@ -1258,18 +1258,18 @@ const remove = id => {
 const create = rpcId => {
   return {
     async dispose() {
-      const rpc = get$2(rpcId);
+      const rpc = get$3(rpcId);
       await rpc.dispose();
     },
     // @ts-ignore
     invoke(method, ...params) {
-      const rpc = get$2(rpcId);
+      const rpc = get$3(rpcId);
       // @ts-ignore
       return rpc.invoke(method, ...params);
     },
     // @ts-ignore
     invokeAndTransfer(method, ...params) {
-      const rpc = get$2(rpcId);
+      const rpc = get$3(rpcId);
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
@@ -1277,7 +1277,7 @@ const create = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$5(rpcId, mockRpc);
+      set$6(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1286,7 +1286,7 @@ const create = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$5(rpcId, rpc);
+      set$6(rpcId, rpc);
     }
   };
 };
@@ -1315,17 +1315,17 @@ const SetFocusContext = 'Viewlet.setFocusContext';
 
 const {
   invoke: invoke$3,
-  set: set$4
+  set: set$5
 } = create(ExtensionManagementWorker);
 
 const {
   invoke: invoke$2,
-  set: set$3
+  set: set$4
 } = create(RendererProcess);
 
 const {
   invoke: invoke$1,
-  set: set$2
+  set: set$3
 } = create(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
@@ -1357,8 +1357,18 @@ const handleClickProblems = async () => {
   await invoke$1('Panel.toggleView', 'Problems');
 };
 
+const EditorEncoding = 'EditorEncoding';
+const EditorIndentation = 'EditorIndentation';
+const EditorLanguage = 'EditorLanguage';
+const EditorPosition = 'EditorPosition';
 const Notifications = 'Notifications';
 const Problems = 'Problems';
+const isEditorStatus = name => {
+  return [EditorEncoding, EditorIndentation, EditorLanguage, EditorPosition].includes(name);
+};
+const isRight = name => {
+  return name === Notifications || isEditorStatus(name);
+};
 
 const handleClick = async (state, name) => {
   if (!name) {
@@ -1376,7 +1386,7 @@ const handleClick = async (state, name) => {
     await handleClickNotification();
   } else if (item.name === Problems) {
     await handleClickProblems();
-  } else {
+  } else if (!isEditorStatus(item.name)) {
     await handleClickExtensionStatusBarItem(name);
   }
   // TODO
@@ -1397,6 +1407,31 @@ const handleContextMenu = async (state, button, x, y) => {
   return state;
 };
 
+const textItem = (name, text, ariaLabel, tooltip) => ({
+  ariaLabel,
+  command: '',
+  elements: [{
+    type: 'text',
+    value: text
+  }],
+  name,
+  tooltip
+});
+const getEditorStatusBarItems = status => {
+  if (!status) {
+    return [];
+  }
+  const {
+    column,
+    encoding,
+    languageId,
+    line,
+    tabSize
+  } = status;
+  const encodingLabel = encoding === 'utf8' ? ['UTF', '8'].join('-') : encoding;
+  return [textItem(EditorPosition, `Ln ${line}, Col ${column}`, `Line ${line}, Column ${column}`, 'Go to Line/Column'), textItem(EditorIndentation, `Spaces: ${tabSize}`, `Spaces: ${tabSize}`, 'Select Indentation'), textItem(EditorEncoding, encodingLabel, `Encoding: ${encodingLabel}`, 'Select Encoding'), textItem(EditorLanguage, languageId, `Language: ${languageId}`, 'Select Language Mode')];
+};
+
 const getAriaLabel = count => {
   if (count === 0) {
     return 'No Notifications';
@@ -1472,11 +1507,12 @@ const getProblemsStatusBarItem = (errorCount, warningCount, enabled) => {
 };
 
 const getBuiltinStatusBarItems = async (errorCount, warningCount, {
+  editorStatus,
   notificationCount = 0,
   notificationsEnabled = true,
   problemsEnabled = true
 } = {}) => {
-  return [...getNotificationsStatusBarItem(notificationsEnabled, notificationCount), ...getProblemsStatusBarItem(errorCount, warningCount, problemsEnabled)];
+  return [...getEditorStatusBarItems(editorStatus), ...getNotificationsStatusBarItem(notificationsEnabled, notificationCount), ...getProblemsStatusBarItem(errorCount, warningCount, problemsEnabled)];
 };
 
 const getExtensionStatusBarItems = async (assetDir, platform) => {
@@ -1556,6 +1592,7 @@ const getStatusBarItems = async ({
   assetDir,
   builtinNotificationsEnabled = true,
   builtinProblemsEnabled = true,
+  editorStatus,
   errorCount,
   platform,
   showItems,
@@ -1568,6 +1605,7 @@ const getStatusBarItems = async ({
   const notificationCount = await getNotificationCount();
   const uiStatusBarItems = toUiStatusBarItems(extensionStatusBarItems);
   const extraItems = await getBuiltinStatusBarItems(errorCount, warningCount, {
+    editorStatus,
     notificationCount,
     notificationsEnabled: builtinNotificationsEnabled,
     problemsEnabled: builtinProblemsEnabled
@@ -1754,8 +1792,8 @@ const isConnected = () => {
 const invoke = (method, ...params) => {
   return invoke$2(method, ...params);
 };
-const set$1 = rpc => {
-  set$3(rpc);
+const set$2 = rpc => {
+  set$4(rpc);
   state.connected = true;
 };
 
@@ -1769,8 +1807,8 @@ const render2 = (uid, diffResult) => {
   const {
     newState,
     oldState
-  } = get$4(uid);
-  set$6(uid, newState, newState);
+  } = get$5(uid);
+  set$7(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   if (!isConnected()) {
     return commands;
@@ -1784,7 +1822,7 @@ const renderOutOfBand = async uid => {
   }
   const {
     newState
-  } = get$4(uid);
+  } = get$5(uid);
   if (newState.initial) {
     return;
   }
@@ -1804,12 +1842,12 @@ const handleExtensionManagementChange = async () => {
     const {
       newState,
       oldState
-    } = get$4(uid);
+    } = get$5(uid);
     const newerState = await handleItemsChanged(newState);
     if (newState === newerState || oldState === newerState) {
       continue;
     }
-    set$6(uid, oldState, {
+    set$7(uid, oldState, {
       ...newState,
       ...newerState
     });
@@ -1836,25 +1874,25 @@ const handleNotificationCountChanged = (state, count) => {
 };
 
 let latestCount;
-const get$1 = () => {
+const get$2 = () => {
   return latestCount;
 };
-const set = count => {
+const set$1 = count => {
   latestCount = count;
 };
 
 const handleNotificationCountChangedAll = async count => {
-  set(count);
+  set$1(count);
   for (const uid of getKeys()) {
     const {
       newState,
       oldState
-    } = get$4(uid);
+    } = get$5(uid);
     const newerState = handleNotificationCountChanged(newState, count);
     if (newState === newerState || oldState === newerState) {
       continue;
     }
-    set$6(uid, oldState, newerState);
+    set$7(uid, oldState, newerState);
     await renderOutOfBand(uid);
   }
 };
@@ -1869,7 +1907,60 @@ const handleExtensionManagementMessagePort = async port => {
     commandMap: commandMap$1,
     messagePort: port
   });
-  set$4(rpc);
+  set$5(rpc);
+};
+
+let editorStatus;
+const get$1 = () => editorStatus;
+const set = value => {
+  editorStatus = value;
+};
+
+const equals = (oldStatus, newStatus) => {
+  if (!oldStatus || !newStatus) {
+    return oldStatus === newStatus;
+  }
+  return oldStatus.column === newStatus.column && oldStatus.encoding === newStatus.encoding && oldStatus.languageId === newStatus.languageId && oldStatus.line === newStatus.line && oldStatus.tabSize === newStatus.tabSize;
+};
+const updateItems = (items, status) => {
+  const remainingItems = items.filter(item => !isEditorStatus(item.name));
+  const editorItems = getEditorStatusBarItems(status);
+  if (editorItems.length === 0) {
+    return remainingItems;
+  }
+  const notificationIndex = remainingItems.findIndex(item => item.name === Notifications);
+  const insertIndex = notificationIndex === -1 ? remainingItems.length : notificationIndex;
+  return [...remainingItems.slice(0, insertIndex), ...editorItems, ...remainingItems.slice(insertIndex)];
+};
+const handleEditorStatusChanged = (state, editorStatus) => {
+  const {
+    editorStatus: oldEditorStatus,
+    statusBarItemsRight
+  } = state;
+  if (equals(oldEditorStatus, editorStatus)) {
+    return state;
+  }
+  return {
+    ...state,
+    editorStatus,
+    statusBarItemsRight: updateItems(statusBarItemsRight, editorStatus)
+  };
+};
+
+const handleEditorStatusChangedAll = async editorStatus => {
+  set(editorStatus);
+  for (const uid of getKeys()) {
+    const {
+      newState,
+      oldState
+    } = get$5(uid);
+    const newerState = handleEditorStatusChanged(newState, editorStatus);
+    if (newState === newerState || oldState === newerState) {
+      continue;
+    }
+    set$7(uid, oldState, newerState);
+    await renderOutOfBand(uid);
+  }
 };
 
 const handleMessagePort = async (port, viewletCommandMap, setAsRendererProcess = true) => {
@@ -1883,12 +1974,13 @@ const handleMessagePort = async (port, viewletCommandMap, setAsRendererProcess =
   };
   const rpc = await create$2({
     commandMap: {
+      'StatusBar.handleEditorStatusChanged': handleEditorStatusChangedAll,
       'Viewlet.executeViewletCommand': executeViewletCommand
     },
     messagePort: port
   });
   if (setAsRendererProcess) {
-    set$1(rpc);
+    set$2(rpc);
   }
 };
 
@@ -1984,6 +2076,7 @@ const loadContent = async state => {
     platform,
     warningCount
   } = state;
+  const editorStatus = get$1();
   const {
     builtinNotificationsEnabled,
     builtinProblemsEnabled,
@@ -1993,6 +2086,7 @@ const loadContent = async state => {
     assetDir,
     builtinNotificationsEnabled: builtinNotificationsEnabled,
     builtinProblemsEnabled: builtinProblemsEnabled,
+    editorStatus,
     errorCount,
     platform,
     showItems: itemsVisible,
@@ -2000,13 +2094,14 @@ const loadContent = async state => {
   });
   const loadedState = {
     ...state,
+    editorStatus,
     errorCount: 0,
     initial: false,
-    statusBarItemsLeft: statusBarItems.filter(item => item.name !== Notifications),
-    statusBarItemsRight: statusBarItems.filter(item => item.name === Notifications),
+    statusBarItemsLeft: statusBarItems.filter(item => !isRight(item.name)),
+    statusBarItemsRight: statusBarItems.filter(item => isRight(item.name)),
     warningCount: 0
   };
-  const latestNotificationCount = get$1();
+  const latestNotificationCount = get$2();
   if (latestNotificationCount === undefined) {
     return loadedState;
   }
@@ -2072,7 +2167,7 @@ const initializeRenderWorker = async () => {
   const rpc = await create$1({
     commandMap: commandMap
   });
-  set$2(rpc);
+  set$3(rpc);
 };
 
 const listen = async () => {

package/package.json

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