Skip to content

[debug-certificate-mangaer] remove shell integration timeout and make make activation event more specific #5322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmiddha merged 4 commits into from
Aug 26, 2025
Merged

[debug-certificate-mangaer] remove shell integration timeout and make make activation event more specific #5322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ccb54f
bump shell integration timeout
bmiddha Aug 26, 2025
0cd685a
bump extension version
bmiddha Aug 26, 2025
90f4123
fix activation event
bmiddha Aug 26, 2025
6b0bddb
remove timeout
bmiddha Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions vscode-extensions/debug-certificate-manager-vscode-extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -107,7 +107,7 @@
},
"enabledApiProposals": [],
"activationEvents": [
"workspaceContains:.vscode/debug-certificate-manager.json"
"workspaceContains:/.vscode/debug-certificate-manager.json"
],
"dependencies": {
"@rushstack/debug-certificate-manager": "workspace:*",
Expand Down
10 changes: 1 addition & 9 deletions vscode-extensions/debug-certificate-manager-vscode-extension/src/terminal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading