diff --git a/vscode-extensions/debug-certificate-manager-vscode-extension/package.json b/vscode-extensions/debug-certificate-manager-vscode-extension/package.json index 76fb49e3639..ad94ab5c49b 100644 --- a/vscode-extensions/debug-certificate-manager-vscode-extension/package.json +++ b/vscode-extensions/debug-certificate-manager-vscode-extension/package.json @@ -1,6 +1,6 @@ { "name": "debug-certificate-manager", - "version": "0.0.2", + "version": "0.0.3", "repository": { "type": "git", "url": "https://github.com/microsoft/rushstack.git", @@ -107,7 +107,7 @@ }, "enabledApiProposals": [], "activationEvents": [ - "workspaceContains:.vscode/debug-certificate-manager.json" + "workspaceContains:/.vscode/debug-certificate-manager.json" ], "dependencies": { "@rushstack/debug-certificate-manager": "workspace:*", diff --git a/vscode-extensions/debug-certificate-manager-vscode-extension/src/terminal.ts b/vscode-extensions/debug-certificate-manager-vscode-extension/src/terminal.ts index 9def626f78b..a84c376c055 100644 --- a/vscode-extensions/debug-certificate-manager-vscode-extension/src/terminal.ts +++ b/vscode-extensions/debug-certificate-manager-vscode-extension/src/terminal.ts @@ -20,24 +20,16 @@ export async function runWorkspaceCommandAsync({ const shellIntegration: vscode.TerminalShellIntegration = vsTerminal.shellIntegration ?? (await new Promise((resolve, reject) => { - let timeoutId: NodeJS.Timeout | undefined; const shellIntegrationDisposable: vscode.Disposable = vscode.window.onDidChangeTerminalShellIntegration( (event) => { if (event.terminal !== vsTerminal) { return; } - if (timeoutId) { - clearTimeout(timeoutId); - timeoutId = undefined; - } + resolve(event.shellIntegration); shellIntegrationDisposable?.dispose(); } ); - timeoutId = setTimeout(() => { - shellIntegrationDisposable?.dispose(); - reject(new Error('Shell integration timeout')); - }, 5000); })); // Run the command through shell integration and grab output