@lvce-editor/quick-pick-worker 4.20.0 → 4.20.2

package/dist/quickPickWorkerMain.js

@@ -1364,34 +1364,34 @@ const SetPatches = 'Viewlet.setPatches';
 const FocusQuickPickInput = 20;
 
 const {
-  invoke: invoke$6,
+  invoke: invoke$7,
   set: set$7
 } = create$4(EditorWorker);
 const getLines = async editorUid => {
-  const lines = await invoke$6('Editor.getLines2', editorUid);
+  const lines = await invoke$7('Editor.getLines2', editorUid);
   return lines;
 };
 
 const {
-  invoke: invoke$5,
+  invoke: invoke$6,
   set: set$6
 } = create$4(ExtensionManagementWorker);
 const getLanguages = (platform, assetDir) => {
-  return invoke$5('Extensions.getLanguages', platform, assetDir);
+  return invoke$6('Extensions.getLanguages', platform, assetDir);
 };
 
 const {
-  invoke: invoke$4,
+  invoke: invoke$5,
   set: set$5
 } = create$4(7013);
 
 const {
-  invoke: invoke$3,
+  invoke: invoke$4,
   set: set$4
 } = create$4(RendererProcess);
 
 const {
-  invoke: invoke$2,
+  invoke: invoke$3,
   invokeAndTransfer,
   set: set$3
 } = create$4(RendererWorker);
@@ -1400,37 +1400,37 @@ const sendMessagePortToEditorWorker = async (port, rpcId) => {
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToEditorWorker', port, command, rpcId);
 };
 const setFocus = key => {
-  return invoke$2('Focus.setFocus', key);
+  return invoke$3('Focus.setFocus', key);
 };
 const getFileIcon = async options => {
-  return invoke$2('IconTheme.getFileIcon', options);
+  return invoke$3('IconTheme.getFileIcon', options);
 };
 const getFolderIcon = async options => {
-  return invoke$2('IconTheme.getFolderIcon', options);
+  return invoke$3('IconTheme.getFolderIcon', options);
 };
 const closeWidget$1 = async widgetId => {
-  return invoke$2('Viewlet.closeWidget', widgetId);
+  return invoke$3('Viewlet.closeWidget', widgetId);
 };
 const sendMessagePortToFileSearchWorker2 = async (port, rpcId = 0) => {
   const command = 'FileSearch.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToFileSearchWorker', port, command, rpcId);
 };
 const getActiveEditorId = () => {
-  return invoke$2('GetActiveEditor.getActiveEditorId');
+  return invoke$3('GetActiveEditor.getActiveEditorId');
 };
 const sendMessagePortToExtensionManagementWorker = async (port, rpcId) => {
   const command = 'Extensions.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionManagementWorker', port, command, rpcId);
 };
 const openUri$1 = async (uri, focus, options) => {
-  await invoke$2('Main.openUri', {
+  await invoke$3('Main.openUri', {
     ...options,
     focus,
     uri
   });
 };
 const showErrorDialog$1 = async errorInfo => {
-  await invoke$2('ErrorHandling.showErrorDialog', errorInfo);
+  await invoke$3('ErrorHandling.showErrorDialog', errorInfo);
 };
 
 const closeWidget = async id => {
@@ -1508,7 +1508,7 @@ const close = async state => {
         }
         executeCallback(resolveId, result);
       } else {
-        await invoke$2('QuickPick.executeCallback', resolveId, result);
+        await invoke$3('QuickPick.executeCallback', resolveId, result);
       }
     }
   }
@@ -1963,9 +1963,10 @@ const handleScrollBarPointerUp = (state, pointerId) => {
   };
 };
 
-const create = (uid, uri, listItemHeight, x, y, width, height, platform, args, _renderAllItems, workspaceUri, assetDir) => {
+const create = (uid, uri, listItemHeight, x, y, width, height, platform, args, _renderAllItems, workspaceUri, assetDir, applicationId) => {
   const state = {
     allowEmptyResult: false,
+    applicationId,
     cursorOffset: 0,
     height: 300,
     icons: [],
@@ -2056,7 +2057,7 @@ const dispose = uid => {
 };
 
 const setColorTheme = id => {
-  return invoke$2(/* ColorTheme.setColorTheme */'ColorTheme.setColorTheme', /* colorThemeId */id);
+  return invoke$3(/* ColorTheme.setColorTheme */'ColorTheme.setColorTheme', /* colorThemeId */id);
 };
 
 const focusPick$1 = async pick => {
@@ -2709,7 +2710,7 @@ const getFinalDeltaY = (height, itemHeight, itemsLength) => {
 };
 
 const getColorThemeNames = async (assetDir, platform) => {
-  return invoke$2('ColorTheme.getColorThemeNames', assetDir, platform);
+  return invoke$3('ColorTheme.getColorThemeNames', assetDir, platform);
 };
 
 const toProtoVisibleItem$4 = name => {
@@ -2793,7 +2794,7 @@ const state$3 = {
 const getAll = async () => {
   try {
     // @ts-ignore
-    const entries = await invoke$2('Layout.getAllQuickPickMenuEntries');
+    const entries = await invoke$3('Layout.getAllQuickPickMenuEntries');
     return entries || [];
   } catch {
     // ignore
@@ -2821,14 +2822,14 @@ const prefixIdWithExt = item => {
     label: item.label || item.id
   };
 };
-const getExtensionPicks = async (assetDir, platform) => {
+const getExtensionPicks = async (assetDir, platform, applicationId) => {
   try {
     // TODO
     // Assert.string(assetDir)
     // Assert.number(platform)
     // TODO ask extension management worker directly
     // TODO don't call this every time, cache the results
-    const extensionPicks = await invoke$2('ExtensionHost.getCommands', assetDir, platform);
+    const extensionPicks = applicationId === undefined ? await invoke$3('ExtensionHost.getCommands', assetDir, platform) : await invoke$3('Application.execute', applicationId, 'ExtensionHost.getCommands', assetDir, platform);
     if (!extensionPicks) {
       return [];
     }
@@ -2861,12 +2862,13 @@ const toProtoVisibleItem$3 = item => {
   return pick;
 };
 const getPicks$e = async (value, args, {
+  applicationId,
   assetDir = '',
   platform = 0
 } = {}) => {
   // TODO get picks in parallel
   const builtinPicks = await getBuiltinPicks();
-  const extensionPicks = await getExtensionPicks(assetDir, platform);
+  const extensionPicks = await getExtensionPicks(assetDir, platform, applicationId);
   const allPicks = [...builtinPicks, ...extensionPicks];
   const converted = allPicks.map(toProtoVisibleItem$3);
   return converted;
@@ -2898,7 +2900,7 @@ const state$1 = {
 const set$1 = newRpc => {
   state$1.rpc = newRpc;
 };
-const invoke$1 = (method, ...args) => {
+const invoke$2 = (method, ...args) => {
   return state$1.rpc.invoke(method, ...args);
 };
 
@@ -2929,7 +2931,7 @@ const getPicks$d = async (searchValue, args) => {
   const options = args.at(-1);
   let items;
   if (options?.mode === 'quickInput') {
-    items = searchValue === '' && options?.customItemsId ? get(options.customItemsId) : await invoke$1('ExtensionHostQuickPick.renderQuickInput', options.quickInputId, searchValue);
+    items = searchValue === '' && options?.customItemsId ? get(options.customItemsId) : await invoke$2('ExtensionHostQuickPick.renderQuickInput', options.quickInputId, searchValue);
   } else {
     items = options?.customItemsId ? get(options.customItemsId) : args[1] || [];
   }
@@ -2954,11 +2956,11 @@ const getPicks$c = async () => {
 const emptyMatches = [];
 
 const getWorkspacePath = async () => {
-  return invoke$2('Workspace.getPath');
+  return invoke$3('Workspace.getPath');
 };
 
 const searchFile$1 = async (path, value, prepare, assetDir) => {
-  const result = await invoke$4('FileSearch.searchFile', path, value, prepare, assetDir);
+  const result = await invoke$5('FileSearch.searchFile', path, value, prepare, assetDir);
   return result;
 };
 
@@ -3352,7 +3354,7 @@ const uniq = array => {
   });
 };
 const getRecentlyOpened = async () => {
-  const recentlyOpened = await invoke$2(/* RecentlyOpened.getRecentlyOpened */'RecentlyOpened.getRecentlyOpened');
+  const recentlyOpened = await invoke$3(/* RecentlyOpened.getRecentlyOpened */'RecentlyOpened.getRecentlyOpened');
   return uniq(recentlyOpened);
 };
 
@@ -3467,7 +3469,7 @@ const selectPickBuiltin = async item => {
   }
   const args = item.args || [];
   // TODO ids should be all numbers for efficiency -> also directly can call command
-  await invoke$2(item.id, ...args);
+  await invoke$3(item.id, ...args);
   if (shouldHide(item)) {
     return {
       command: Hide
@@ -3477,10 +3479,14 @@ const selectPickBuiltin = async item => {
     command: KeepOpen
   };
 };
-const selectPickExtension = async item => {
+const selectPickExtension = async (item, applicationId) => {
   const id = item.id.slice(4); // TODO lots of string allocation with 'ext.' find a better way to separate builtin commands from extension commands
   try {
-    await invoke$2('ExtensionHost.executeCommand', id);
+    if (applicationId === undefined) {
+      await invoke$3('ExtensionHost.executeCommand', id);
+    } else {
+      await invoke$3('Application.execute', applicationId, 'ExtensionHost.executeCommand', id);
+    }
   } catch (error) {
     await handleError(error, false);
     await showErrorDialog(error);
@@ -3492,13 +3498,13 @@ const selectPickExtension = async item => {
     command: Hide
   };
 };
-const selectPick$b = async item => {
+const selectPick$b = async (item, _value = '', applicationId) => {
   // @ts-ignore
   const {
     id
   } = item;
   if (id.startsWith('ext.')) {
-    return selectPickExtension(item);
+    return selectPickExtension(item, applicationId);
   }
   return selectPickBuiltin(item);
 };
@@ -3538,7 +3544,7 @@ const selectPick$a = async (_pick, value) => {
     }
     executeCallback(resolveId, result);
   } else {
-    await invoke$2('QuickPick.executeCallback', resolveId, result);
+    await invoke$3('QuickPick.executeCallback', resolveId, result);
   }
   return {
     command: Hide
@@ -3547,7 +3553,7 @@ const selectPick$a = async (_pick, value) => {
 
 const selectPick$9 = async pick => {
   const editorId = await getActiveEditorId();
-  await invoke$2('Viewlet.executeViewletCommand', editorId, 'setEndOfLine', pick.value);
+  await invoke$3('Viewlet.executeViewletCommand', editorId, 'setEndOfLine', pick.value);
   return {
     command: Hide
   };
@@ -3571,12 +3577,12 @@ const selectPick$8 = async pick => {
 };
 
 const setCursor = async (rowIndex, columnIndex) => {
-  await invoke$2('Editor.cursorSet', rowIndex, columnIndex);
+  await invoke$3('Editor.cursorSet', rowIndex, columnIndex);
 };
 
 const goToPositionAndFocus = async (rowIndex, columnIndex) => {
   await setCursor(rowIndex, columnIndex);
-  await invoke$2('Editor.handleFocus');
+  await invoke$3('Editor.handleFocus');
 };
 
 const selectPickGoToColumn = async (item, value) => {
@@ -3619,7 +3625,7 @@ const selectPick$6 = async item => {
 
 const selectPick$5 = async pick => {
   const editorId = await getActiveEditorId();
-  await invoke$2('Viewlet.executeViewletCommand', editorId, 'setIndentation', pick.value);
+  await invoke$3('Viewlet.executeViewletCommand', editorId, 'setIndentation', pick.value);
   return {
     command: Hide
   };
@@ -3628,7 +3634,7 @@ const selectPick$5 = async pick => {
 const selectPick$4 = async pick => {
   const editorId = await getActiveEditorId();
   const value = pick.value;
-  await invoke$2('Viewlet.executeViewletCommand', editorId, 'setLanguageId', value.languageId, value.tokenizePath);
+  await invoke$3('Viewlet.executeViewletCommand', editorId, 'setLanguageId', value.languageId, value.tokenizePath);
   return {
     command: Hide
   };
@@ -3636,7 +3642,7 @@ const selectPick$4 = async pick => {
 
 const openWorkspaceFolder = uri => {
   const command = uri.includes('://') ? 'Workspace.setUri' : 'Workspace.setPath';
-  return invoke$2(command, uri);
+  return invoke$3(command, uri);
 };
 
 // TODO selectPick should be independent of show/hide
@@ -3684,11 +3690,13 @@ const getSelect = id => {
 };
 
 const getPicks = (id, searchValue, args, {
+  applicationId,
   assetDir,
   platform
 }) => {
   const fn = getPicks$1(id);
   return fn(searchValue, args, {
+    applicationId,
     assetDir,
     platform
   });
@@ -3758,6 +3766,7 @@ const setValue = async (state, newValue) => {
   const subId = getQuickPickSubProviderId(providerId, prefix);
   const quickInput = isQuickInput(args);
   const newPicks = isStaticQuickInput(args) || subId === LanguageMode$1 ? state.picks : await getPicks(subId, newValue, args, {
+    applicationId: state.applicationId,
     assetDir,
     platform
   });
@@ -3881,7 +3890,7 @@ const handleBlur = async state => {
     const options = args.at(-1);
     if (!options?.executeItemCommand) {
       const resolveId = args[2];
-      await invoke$2('QuickPick.executeCallback', resolveId, getCancelResult(args));
+      await invoke$3('QuickPick.executeCallback', resolveId, getCancelResult(args));
     }
   }
   await closeWidget(state.uid);
@@ -4027,6 +4036,7 @@ const getLoadedState = async state => {
   const prefix = getQuickPickPrefix(value);
   const subId = getQuickPickSubProviderId(id, prefix);
   const newPicks = await getPicks(subId, value, args, {
+    applicationId: state.applicationId,
     assetDir,
     platform
   });
@@ -4135,10 +4145,10 @@ const selectIndex = async (state, index, button = /* left */0) => {
   const fn = getSelect(subId);
   if (shouldCloseBeforeSelect(subId, pick)) {
     await closeWidget(state.uid);
-    void fn(pick, value);
+    void fn(pick, value, state.applicationId);
     return state;
   }
-  const selectPickResult = await fn(pick, value);
+  const selectPickResult = await fn(pick, value, state.applicationId);
   object(selectPickResult);
   string(selectPickResult.command);
   const {
@@ -4148,7 +4158,7 @@ const selectIndex = async (state, index, button = /* left */0) => {
     case Hide:
       await closeWidget(state.uid);
       if (selectPickResult.itemCommand) {
-        await invoke$2(selectPickResult.itemCommand, ...(selectPickResult.itemCommandArgs || []));
+        await invoke$3(selectPickResult.itemCommand, ...(selectPickResult.itemCommandArgs || []));
       }
       return state;
     case OpenColorTheme:
@@ -4217,8 +4227,8 @@ const isConnected = () => {
   } = state;
   return connected;
 };
-const invoke = (method, ...params) => {
-  return invoke$3(method, ...params);
+const invoke$1 = (method, ...params) => {
+  return invoke$4(method, ...params);
 };
 const set = rpc => {
   set$4(rpc);
@@ -4232,7 +4242,7 @@ const handleRendererProcessMessagePort = async (port, viewletCommandMap, setAsRe
       throw new TypeError(`Viewlet command not found: ${command}`);
     }
     await fn(uid, ...args);
-    await invoke$2('Viewlet.requestRender', uid);
+    await invoke$3('Viewlet.requestRender', uid);
   };
   const rpc = await create$8({
     commandMap: {
@@ -5045,7 +5055,7 @@ const isFocusContextCommand = command => {
 const renderDirect = async (uid, commands) => {
   const rendererWorkerCommands = commands.filter(isFocusContextCommand);
   const rendererProcessCommands = commands.filter(command => !isFocusContextCommand(command));
-  const transactionId = await invoke('Viewlet.queueCommands', uid, rendererProcessCommands);
+  const transactionId = await invoke$1('Viewlet.queueCommands', uid, rendererProcessCommands);
   return [...rendererWorkerCommands, ['Viewlet.commitPending', uid, transactionId]];
 };
 const render2 = (uid, diffResult) => {
@@ -5146,7 +5156,12 @@ const serialize = command => {
   };
 };
 
+const invoke = async (applicationId, method, ...args) => {
+  return applicationId === undefined ? invoke$3(method, ...args) : invoke$3('Application.execute', applicationId, method, ...args);
+};
+
 const showQuickInput = async ({
+  applicationId,
   id,
   ignoreFocusOut,
   initialItems = [],
@@ -5157,7 +5172,7 @@ const showQuickInput = async ({
   const customItemsId = add(initialItems);
   const picks = [];
   try {
-    const result = await invoke$2('QuickPick.showCustom', picks, {
+    const result = await invoke(applicationId, 'QuickPick.showCustom', picks, {
       customItemsId,
       ignoreFocusOut,
       initialValue,
@@ -5179,6 +5194,7 @@ const QuickPick = 'QuickPick';
 
 const showQuickPick = async ({
   acceptInput = false,
+  applicationId,
   items,
   placeholder = '',
   waitUntil = 'selected'
@@ -5189,7 +5205,7 @@ const showQuickPick = async ({
     promise
   } = registerCallback();
   try {
-    await invoke$2('Viewlet.openWidget', QuickPick, 'custom', [], id, {
+    await invoke(applicationId, 'Viewlet.openWidget', QuickPick, 'custom', [], id, {
       acceptInput,
       callbackOwner: 'quickPickWorker',
       customItemsId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/quick-pick-worker",
-  "version": "4.20.0",
+  "version": "4.20.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lvce-editor/quick-pick-worker.git"