identify terminal processes by name

stateful · Feb 23, 2023 · 4c5da8e · 4c5da8e
1 parent 853b780
commit 4c5da8e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/src/extension/executors/runner.ts b/src/extension/executors/runner.ts
@@ -123,9 +123,9 @@ export async function executeRunner(
     const taskExecution = new Task(
       { type: 'shell', name: `Runme Task (${RUNME_ID})` },
       TaskScope.Workspace,
-      cellText.length > LABEL_LIMIT
+      (cellText.length > LABEL_LIMIT
         ? `${cellText.slice(0, LABEL_LIMIT)}...`
-        : cellText,
+        : cellText) + ` (RUNME_ID: ${RUNME_ID})`,
       'exec',
       new CustomExecution(async () => program)
     )

diff --git a/src/extension/provider/background.ts b/src/extension/provider/background.ts
@@ -29,8 +29,17 @@ export class ShowTerminalProvider implements vscode.NotebookCellStatusBarItemPro
       return
     }
 
+    const terminalButtonParts = [
+      '$(terminal)',
+      'Open Terminal',
+    ]
+
+    if (pid > -1) {
+      terminalButtonParts.push(`(PID: ${pid})`)
+    }
+
     const item = new NotebookCellStatusBarItem(
-      `$(terminal) Open Terminal (PID: ${pid})`,
+      terminalButtonParts.join(' '),
       NotebookCellStatusBarAlignment.Right
     )
     item.command = 'runme.openTerminal'

diff --git a/src/extension/utils.ts b/src/extension/utils.ts
@@ -79,10 +79,15 @@ export function validateAnnotations(cell: NotebookCell): CellAnnotationsErrorRes
 
 }
 
+function getTerminalRunmeId(t: vscode.Terminal): string|undefined {
+  return (t.creationOptions as vscode.TerminalOptions).env?.RUNME_ID
+    ?? /\(RUNME_ID: (.*)\)$/.exec(t.name)?.[1]
+    ?? undefined
+}
+
 export function getTerminalByCell(cell: vscode.NotebookCell) {
   return vscode.window.terminals.find((t) => {
-    const taskEnv = (t.creationOptions as vscode.TerminalOptions).env || {}
-    return taskEnv.RUNME_ID === `${cell.document.fileName}:${cell.index}`
+    return getTerminalRunmeId(t) === `${cell.document.fileName}:${cell.index}`
   })
 }