Attach shell should take focus (microsoft#2421)

Dmarch28 · Mar 4, 2021 · 428e348 · 428e348
1 parent eb8b3f6
commit 428e348
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/src/commands/containers/attachShellContainer.ts b/src/commands/containers/attachShellContainer.ts
@@ -62,5 +62,5 @@ export async function attachShellContainer(context: IActionContext, node?: Conta
         shellCommand
     );
 
-    await executeAsTask(context, terminalCommand, `Shell: ${node.containerName}`, { addDockerEnv: true, alwaysRunNew: true });
+    await executeAsTask(context, terminalCommand, `Shell: ${node.containerName}`, { addDockerEnv: true, alwaysRunNew: true, focus: true });
 }
diff --git a/src/commands/images/runAzureCliImage.ts b/src/commands/images/runAzureCliImage.ts
@@ -45,6 +45,6 @@ export async function runAzureCliImage(context: IActionContext): Promise<void> {
             vol += ` -v ${workspaceFolder.uri.fsPath}:/workspace`;
         }
 
-        await executeAsTask(context, `docker run ${option} ${vol.trim()} -it --rm mcr.microsoft.com/azure-cli:latest`, 'Azure CLI', { addDockerEnv: true });
+        await executeAsTask(context, `docker run ${option} ${vol.trim()} -it --rm mcr.microsoft.com/azure-cli:latest`, 'Azure CLI', { addDockerEnv: true, focus: true });
     }
 }
diff --git a/src/utils/executeAsTask.ts b/src/utils/executeAsTask.ts
@@ -8,7 +8,16 @@ import * as vscode from 'vscode';
 import { IActionContext } from 'vscode-azureextensionui';
 import { addDockerSettingsToEnv } from './addDockerSettingsToEnv';
 
-export async function executeAsTask(context: IActionContext, command: string, name: string, options: { addDockerEnv?: boolean, workspaceFolder?: vscode.WorkspaceFolder, cwd?: string, alwaysRunNew?: boolean, rejectOnError?: boolean }): Promise<void> {
+interface ExecuteAsTaskOptions {
+    addDockerEnv?: boolean;
+    workspaceFolder?: vscode.WorkspaceFolder;
+    cwd?: string;
+    alwaysRunNew?: boolean;
+    rejectOnError?: boolean;
+    focus?: boolean;
+}
+
+export async function executeAsTask(context: IActionContext, command: string, name: string, options: ExecuteAsTaskOptions): Promise<void> {
     let newEnv: NodeJS.ProcessEnv | undefined;
     options = options ?? {};
 
@@ -34,6 +43,12 @@ export async function executeAsTask(context: IActionContext, command: string, na
         task.definition.idRandomizer = Math.random();
     }
 
+    if (options.focus) {
+        task.presentationOptions = {
+            focus: true,
+        };
+    }
+
     const taskExecution = await vscode.tasks.executeTask(task);
 
     const taskEndPromise = new Promise<void>((resolve, reject) => {