development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 21:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #208326 from microsoft/tyriar/208307

Browse source 
Reveal the current session command in run recent
This commit is contained in:
Daniel Imms 2024-03-21 12:01:14 -07:00 committed by GitHub
parent 2efb6a9f8c 47d2d566fd
commit 8b943b4687
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/vs/workbench/contrib/terminal/browser/terminalRunRecentQuickPick.ts
View file

@ -218,7 +218,7 @@ export async function showRunRecentQuickPick(
instantiationService.invokeFunction(showRunRecentQuickPick, instance, terminalInRunCommandPicker, type, fuzzySearchToggle.checked ? 'fuzzy' : 'contiguous', quickPick.value);
});
const outputProvider = instantiationService.createInstance(TerminalOutputProvider);
const quickPick = quickInputService.createQuickPick<IQuickPickItem & { rawLabel: string }>();
const quickPick = quickInputService.createQuickPick<Item | IQuickPickItem & { rawLabel: string }>();
const originalItems = items;
quickPick.items = [...originalItems];
quickPick.sortByLabel = false;
@ -258,6 +258,24 @@ export async function showRunRecentQuickPick(
await instantiationService.invokeFunction(showRunRecentQuickPick, instance, terminalInRunCommandPicker, type, filterMode, value);
}
});
let terminalScrollStateSaved = false;
quickPick.onDidChangeActive(async () => {
const xterm = instance.xterm;
if (!xterm) {
return;
}
const [item] = quickPick.activeItems;
if ('command' in item && item.command) {
if (!terminalScrollStateSaved) {
xterm.markTracker.saveScrollState();
terminalScrollStateSaved = true;
}
xterm.markTracker.revealCommand(item.command);
} else {
terminalScrollStateSaved = false;
xterm.markTracker.restoreScrollState();
}
});
quickPick.onDidAccept(async () => {
const result = quickPick.activeItems[0];
let text: string;
@ -271,6 +289,12 @@ export async function showRunRecentQuickPick(
if (quickPick.keyMods.alt) {
instance.focus();
}
terminalScrollStateSaved = false;
instance.xterm?.markTracker.restoreScrollState();
});
quickPick.onDidHide(() => {
terminalScrollStateSaved = false;
instance.xterm?.markTracker.restoreScrollState();
});
if (value) {
quickPick.value = value;