fix: make createTabPane async

CyanSalt · Nov 21, 2024 · 9b02ce1 · 9b02ce1
1 parent 69ac946
commit 9b02ce1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/addons/launcher/src/renderer/launcher.ts b/addons/launcher/src/renderer/launcher.ts
@@ -90,7 +90,7 @@ export async function openLauncher(launcher: Launcher, options: OpenLauncherOpti
   const character = getTerminalTabCharacterByLauncher(launcher)
   const pane = launcher.pane ? commas.workspace.getPane(launcher.pane) : undefined
   if (pane) {
-    const paneTab = commas.workspace.createPaneTab(pane, {
+    const paneTab = await commas.workspace.createPaneTab(pane, {
       ...profile,
       command: launcher.command,
       character,

diff --git a/src/api/modules/workspace.ts b/src/api/modules/workspace.ts
@@ -35,9 +35,9 @@ function registerTabPane(this: RendererAPIContext, name: string, pane: TerminalT
   if (pane.volatile) {
     const generateID = this.$.helper.createIDGenerator()
     const factory = pane.factory
-    pane.factory = info => ({
+    pane.factory = async info => ({
       pid: Number(generateID()),
-      ...factory?.(info),
+      ...await factory?.(info),
     })
   }
   this.$.app.onInvalidate(() => {
@@ -55,14 +55,14 @@ function getTerminalTabByPane(pane: TerminalTabPane, info: Partial<TerminalTab>
 
 export type PaneTabInfo = Pick<TerminalTab, 'command' | 'process' | 'cwd' | 'shell' | 'character'>
 
-function createPaneTab(pane: TerminalTabPane, info?: Partial<PaneTabInfo>) {
+async function createPaneTab(pane: TerminalTabPane, info?: Partial<PaneTabInfo>) {
   return reactive({
     pid: 0,
     process: pane.name,
     title: '',
     cwd: '',
     ...info,
-    ...pane.factory?.(info),
+    ...await pane.factory?.(info),
     pane: markRaw(pane),
   } as TerminalTab)
 }
@@ -77,7 +77,7 @@ async function openPaneTab(name: string, info?: Partial<PaneTabInfo>) {
       return tab
     }
   }
-  const paneTab = createPaneTab(pane, info)
+  const paneTab = await createPaneTab(pane, info)
   await activateOrAddTerminalTab(paneTab)
   return paneTab
 }

diff --git a/src/types/terminal.ts b/src/types/terminal.ts
@@ -22,7 +22,9 @@ export interface TerminalTabPane {
     save?: () => void,
   },
   volatile?: boolean,
-  factory?: (info?: Partial<TerminalTab>) => Partial<TerminalTab> | undefined,
+  factory?: (
+    info?: Partial<TerminalTab>
+  ) => Partial<TerminalTab> | undefined | Promise<Partial<TerminalTab> | undefined>,
 }
 
 export interface TerminalTabCharacter {