@lvce-editor/status-bar-worker 3.31.2 → 3.31.4

package/dist/settings.json

@@ -5,7 +5,7 @@
     "heading": "Show Status Bar Items",
     "id": "statusBar.itemsVisible",
     "type": "boolean",
-    "value": "true"
+    "value": true
   },
   {
     "category": "workbench",
@@ -13,7 +13,7 @@
     "heading": "Show Notifications Status",
     "id": "statusBar.builtinNotificationsEnabled",
     "type": "boolean",
-    "value": "true"
+    "value": true
   },
   {
     "category": "workbench",
@@ -21,6 +21,6 @@
     "heading": "Show Problems Status",
     "id": "statusBar.builtinProblemsEnabled",
     "type": "boolean",
-    "value": "true"
+    "value": true
   }
 ]

package/dist/statusBarWorkerMain.js

@@ -2,7 +2,7 @@ const toCommandId = key => {
   const dotIndex = key.indexOf('.');
   return key.slice(dotIndex + 1);
 };
-const create$8 = () => {
+const create$a = () => {
   const commandQueues = new Map();
   const generations = Object.create(null);
   const states = Object.create(null);
@@ -265,12 +265,12 @@ const {
   getCommandIds,
   getKeys,
   registerCommands,
-  set: set$6,
+  set: set$7,
   wrapCommand,
   wrapGetter,
-  wrapSerialAsyncCommand} = create$8();
+  wrapSerialAsyncCommand} = create$a();
 
-const create$7 = (uid, uri, x, y, width, height, platform, assetDir) => {
+const create$9 = (uid, uri, x, y, width, height, platform, assetDir) => {
   const state = {
     assetDir,
     errorCount: 0,
@@ -281,7 +281,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) => {
@@ -641,6 +641,53 @@ const getMatchingItem = (itemsLeft, itemsRight, name) => {
   return getMatchingItemInternal(itemsLeft, name) ?? getMatchingItemInternal(itemsRight, name);
 };
 
+const EditorEncoding = 'EditorEncoding';
+const EditorEndOfLine = 'EditorEndOfLine';
+const EditorIndentation = 'EditorIndentation';
+const EditorLanguage = 'EditorLanguage';
+const EditorPosition = 'EditorPosition';
+const Notifications = 'Notifications';
+const Problems = 'Problems';
+const isEditorStatus = name => {
+  return [EditorEncoding, EditorEndOfLine, EditorIndentation, EditorLanguage, EditorPosition].includes(name);
+};
+const isRight = name => {
+  return name === Notifications || isEditorStatus(name);
+};
+
+const state$1 = {
+  rpc: undefined
+};
+const set$6 = rpc => {
+  state$1.rpc = rpc;
+};
+const invoke$4 = (method, ...args) => {
+  const {
+    rpc
+  } = state$1;
+  return rpc.invoke(method, ...args);
+};
+
+const handleClickEditorStatus = async (name, status) => {
+  if (!status) {
+    return;
+  }
+  switch (name) {
+    case EditorEndOfLine:
+      await invoke$4('QuickPick.openStatusBarPicker', 'end-of-line');
+      return;
+    case EditorIndentation:
+      await invoke$4('QuickPick.openStatusBarPicker', 'indentation');
+      return;
+    case EditorLanguage:
+      await invoke$4('QuickPick.openStatusBarPicker', 'language-mode');
+      return;
+    case EditorPosition:
+      await invoke$4('QuickPick.openStatusBarPicker', 'go-to-line', status.line, status.column);
+      return;
+  }
+};
+
 const normalizeLine = line => {
   if (line.startsWith('Error: ')) {
     return line.slice('Error: '.length);
@@ -1352,6 +1399,23 @@ const restoreMessageError = (error, _currentStack) => {
   }
   return restoredError;
 };
+const getFallbackMessage = error => {
+  if (error && typeof error.message === 'string' && error.message) {
+    return error.message;
+  }
+  if (error && error.data) {
+    return getFallbackMessage(error.data);
+  }
+  const stringified = String(error);
+  if (stringified !== '[object Object]') {
+    return stringified;
+  }
+  try {
+    return JSON.stringify(error);
+  } catch {
+    return stringified;
+  }
+};
 const restoreJsonRpcError = error => {
   const currentStack = getCurrentStack();
   if (error && error instanceof Error) {
@@ -1360,13 +1424,13 @@ const restoreJsonRpcError = error => {
   if (error && error.code && error.code === MethodNotFound) {
     return restoreMethodNotFoundError(error, currentStack);
   }
+  if (error && error.error) {
+    return restoreJsonRpcError(error.error);
+  }
   if (error && error.message) {
     return restoreMessageError(error);
   }
-  if (typeof error === 'string') {
-    return new Error(`JsonRpc Error: ${error}`);
-  }
-  return new Error(`JsonRpc Error: ${error}`);
+  return new Error(`JsonRpc Error: ${getFallbackMessage(error)}`);
 };
 const unwrapJsonRpcResult = responseMessage => {
   if ('error' in responseMessage) {
@@ -1445,7 +1509,7 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$6 = (message, result) => {
+const create$8 = (message, result) => {
   return {
     id: message.id,
     jsonrpc: Two$1,
@@ -1454,7 +1518,7 @@ const create$6 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$6(message, resultProperty);
+  return create$8(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -1553,7 +1617,7 @@ const handleJsonRpcMessage = async (...args) => {
 
 const Two = '2.0';
 
-const create$5 = (method, params) => {
+const create$7 = (method, params) => {
   return {
     jsonrpc: Two,
     method,
@@ -1561,7 +1625,7 @@ const create$5 = (method, params) => {
   };
 };
 
-const create$4 = (id, method, params) => {
+const create$6 = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -1572,12 +1636,12 @@ const create$4 = (id, method, params) => {
 };
 
 let id = 0;
-const create$3 = () => {
+const create$5 = () => {
   return ++id;
 };
 
 const registerPromise = map => {
-  const id = create$3();
+  const id = create$5();
   const {
     promise,
     resolve
@@ -1594,7 +1658,7 @@ const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer)
     id,
     promise
   } = registerPromise(callbacks);
-  const message = create$4(id, method, params);
+  const message = create$6(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -1630,7 +1694,7 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$5(method, params);
+      const message = create$7(method, params);
       ipc.send(message);
     }
   };
@@ -1670,7 +1734,35 @@ const listen$1 = async (module, options) => {
   return ipc;
 };
 
-const create$2 = async ({
+const createSharedLazyRpc = factory => {
+  let rpcPromise;
+  const getOrCreate = () => {
+    if (!rpcPromise) {
+      rpcPromise = factory();
+    }
+    return rpcPromise;
+  };
+  return {
+    async dispose() {
+      const rpc = await getOrCreate();
+      await rpc.dispose();
+    },
+    async invoke(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invoke(method, ...params);
+    },
+    async invokeAndTransfer(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    async send(method, ...params) {
+      const rpc = await getOrCreate();
+      rpc.send(method, ...params);
+    }
+  };
+};
+
+const create$4 = async ({
   commandMap,
   isMessagePortOpen = true,
   messagePort
@@ -1688,6 +1780,37 @@ const create$2 = async ({
   return rpc;
 };
 
+const create$3 = async ({
+  commandMap,
+  isMessagePortOpen,
+  send
+}) => {
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
+  await send(port1);
+  return create$4({
+    commandMap,
+    isMessagePortOpen,
+    messagePort: port2
+  });
+};
+
+const create$2 = async ({
+  commandMap,
+  isMessagePortOpen,
+  send
+}) => {
+  return createSharedLazyRpc(() => {
+    return create$3({
+      commandMap,
+      isMessagePortOpen,
+      send
+    });
+  });
+};
+
 const create$1 = async ({
   commandMap
 }) => {
@@ -1779,6 +1902,7 @@ const {
 
 const {
   invoke: invoke$1,
+  invokeAndTransfer,
   set: set$2
 } = create(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
@@ -1792,40 +1916,6 @@ const getPreference = async key => {
   return await invoke$1('Preferences.get', key);
 };
 
-const EditorEncoding = 'EditorEncoding';
-const EditorEndOfLine = 'EditorEndOfLine';
-const EditorIndentation = 'EditorIndentation';
-const EditorLanguage = 'EditorLanguage';
-const EditorPosition = 'EditorPosition';
-const Notifications = 'Notifications';
-const Problems = 'Problems';
-const isEditorStatus = name => {
-  return [EditorEncoding, EditorEndOfLine, EditorIndentation, EditorLanguage, EditorPosition].includes(name);
-};
-const isRight = name => {
-  return name === Notifications || isEditorStatus(name);
-};
-
-const handleClickEditorStatus = async (name, status) => {
-  if (!status) {
-    return;
-  }
-  switch (name) {
-    case EditorEndOfLine:
-      await invoke$1('Viewlet.openWidget', 'QuickPick', 'end-of-line');
-      return;
-    case EditorIndentation:
-      await invoke$1('Viewlet.openWidget', 'QuickPick', 'indentation');
-      return;
-    case EditorLanguage:
-      await invoke$1('Viewlet.openWidget', 'QuickPick', 'language-mode');
-      return;
-    case EditorPosition:
-      await invoke$1('Viewlet.openWidget', 'QuickPick', 'go-to-line', status.line, status.column);
-      return;
-  }
-};
-
 const handleClickExtensionStatusBarItem = async name => {
   try {
     await invoke$3('Extensions.executeCommand', name);
@@ -2053,7 +2143,7 @@ const render2 = (uid, diffResult) => {
     newState,
     oldState
   } = get$5(uid);
-  set$6(uid, newState, newState);
+  set$7(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   if (!isConnected()) {
     return commands;
@@ -2100,7 +2190,7 @@ const handleEditorStatusChangedAll = async update => {
     if (newState === newerState || oldState === newerState) {
       continue;
     }
-    set$6(uid, oldState, newerState);
+    set$7(uid, oldState, newerState);
     changedUids.push(uid);
   }
   await Promise.all(changedUids.map(renderOutOfBand));
@@ -2141,7 +2231,7 @@ const handleEditorStatusVisibilityChangedAll = async visible => {
     if (newState === newerState || oldState === newerState) {
       continue;
     }
-    set$6(uid, oldState, newerState);
+    set$7(uid, oldState, newerState);
     changedUids.push(uid);
   }
   await Promise.all(changedUids.map(renderOutOfBand));
@@ -2383,7 +2473,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$6(uid, current.oldState, {
+    set$7(uid, current.oldState, {
       ...current.newState,
       statusBarItemsLeft: newerState.statusBarItemsLeft
     });
@@ -2428,7 +2518,7 @@ const handleNotificationCountChangedAll = async count => {
     if (newState === newerState || oldState === newerState) {
       continue;
     }
-    set$6(uid, oldState, newerState);
+    set$7(uid, oldState, newerState);
     await renderOutOfBand(uid);
   }
 };
@@ -2439,7 +2529,7 @@ const commandMap$1 = {
 };
 
 const handleExtensionManagementMessagePort = async port => {
-  const rpc = await create$2({
+  const rpc = await create$4({
     commandMap: commandMap$1,
     messagePort: port
   });
@@ -2457,7 +2547,7 @@ const handleMessagePort = async (port, viewletCommandMap, setAsRendererProcess =
     await fn(uid, ...args);
     await invoke$1('Viewlet.requestRender', uid);
   };
-  const rpc = await create$2({
+  const rpc = await create$4({
     commandMap: {
       'StatusBar.handleEditorStatusChanged': handleEditorStatusChangedAll,
       'StatusBar.handleEditorStatusVisibilityChanged': handleEditorStatusVisibilityChangedAll,
@@ -2687,7 +2777,7 @@ const handleWorkspaceChangeAndRefresh = async (uid, workspacePath) => {
   await refreshExtensionItems(uid);
 };
 const commandMap = {
-  'StatusBar.create': create$7,
+  'StatusBar.create': create$9,
   'StatusBar.diff2': diff2,
   'StatusBar.getCommandIds': getCommandIds,
   'StatusBar.getComponentDom': getComponentDom,
@@ -2718,6 +2808,16 @@ const commandMap = {
   'StatusBar.terminate': terminate
 };
 
+const initializeQuickPickWorker = async () => {
+  const rpc = await create$2({
+    commandMap: {},
+    async send(port) {
+      await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToQuickPickWorker', port, 'QuickPick.handleStatusBarMessagePort', 0);
+    }
+  });
+  set$6(rpc);
+};
+
 const initializeRenderWorker = async () => {
   const rpc = await create$1({
     commandMap: commandMap
@@ -2727,7 +2827,7 @@ const initializeRenderWorker = async () => {
 
 const listen = async () => {
   registerCommands(commandMap);
-  await initializeRenderWorker();
+  await Promise.all([initializeRenderWorker(), initializeQuickPickWorker()]);
 };
 
 const main = async () => {

package/package.json

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