Skip to content

Set initial debug session pick and edit pick prompt #156387

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
andreamah merged 1 commit into from
Jul 27, 2022
Merged

Set initial debug session pick and edit pick prompt #156387

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 13 additions & 5 deletions src/vs/workbench/contrib/debug/browser/debugSessionPicker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,14 @@ export async function showDebugSessionMenu(accessor: ServicesAccessor, selectAnd
const quickPick = quickInputService.createQuickPick<IPickerDebugItem>();
localDisposableStore.add(quickPick);
quickPick.matchOnLabel = quickPick.matchOnDescription = quickPick.matchOnDetail = quickPick.sortByLabel = false;
quickPick.placeholder = nls.localize('moveFocusedView.selectView', 'Search for debug session by name');
quickPick.items = _getPicks(quickPick.value, selectAndStartID, debugService, viewsService, commandService);
quickPick.placeholder = nls.localize('moveFocusedView.selectView', 'Search debug sessions by name');

const pickItems = _getPicksAndActiveItem(quickPick.value, selectAndStartID, debugService, viewsService, commandService);
quickPick.items = pickItems.picks;
quickPick.activeItems = pickItems.activeItems;

localDisposableStore.add(quickPick.onDidChangeValue(async () => {
quickPick.items = _getPicks(quickPick.value, selectAndStartID, debugService, viewsService, commandService);
quickPick.items = _getPicksAndActiveItem(quickPick.value, selectAndStartID, debugService, viewsService, commandService).picks;
}));
localDisposableStore.add(quickPick.onDidAccept(() => {
const selectedItem = quickPick.selectedItems[0];
Expand All @@ -39,11 +42,13 @@ export async function showDebugSessionMenu(accessor: ServicesAccessor, selectAnd
quickPick.show();
}

function _getPicks(filter: string, selectAndStartID: string, debugService: IDebugService, viewsService: IViewsService, commandService: ICommandService): Array<IPickerDebugItem | IQuickPickSeparator> {
function _getPicksAndActiveItem(filter: string, selectAndStartID: string, debugService: IDebugService, viewsService: IViewsService, commandService: ICommandService): { picks: Array<IPickerDebugItem | IQuickPickSeparator>; activeItems: Array<IPickerDebugItem> } {
const debugConsolePicks: Array<IPickerDebugItem | IQuickPickSeparator> = [];
const headerSessions: IDebugSession[] = [];

const currSession = debugService.getViewModel().focusedSession;
const sessions = debugService.getModel().getSessions(false);
const activeItems: Array<IPickerDebugItem> = [];

sessions.forEach((session) => {
if (session.compact && session.parentSession) {
Expand All @@ -61,6 +66,9 @@ function _getPicks(filter: string, selectAndStartID: string, debugService: IDebu
const pick = _createPick(session, filter, debugService, viewsService, commandService);
if (pick) {
debugConsolePicks.push(pick);
if (session.getId() === currSession?.getId()) {
activeItems.push(pick);
}
}
}
});
Expand All @@ -76,7 +84,7 @@ function _getPicks(filter: string, selectAndStartID: string, debugService: IDebu
accept: () => commandService.executeCommand(selectAndStartID)
});

return debugConsolePicks;
return { picks: debugConsolePicks, activeItems };
}


Expand Down