development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #208803 from microsoft/tyriar/208591

Browse source 
Don't clear after timeout, highlight multi-line commands
This commit is contained in:
Daniel Imms 2024-03-26 12:15:31 -07:00 committed by GitHub
parent 17654904b6 5b3380c48e
commit c27738b91c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -259,21 +259,36 @@ export async function showRunRecentQuickPick(
}
});
let terminalScrollStateSaved = false;
function restoreScrollState() {
terminalScrollStateSaved = false;
instance.xterm?.markTracker.restoreScrollState();
instance.xterm?.markTracker.clear();
}
quickPick.onDidChangeActive(async () => {
const xterm = instance.xterm;
if (!xterm) {
return;
}
const [item] = quickPick.activeItems;
if ('command' in item && item.command) {
if ('command' in item && item.command && item.command.marker) {
if (!terminalScrollStateSaved) {
xterm.markTracker.saveScrollState();
terminalScrollStateSaved = true;
}
xterm.markTracker.revealCommand(item.command);
const promptRowCount = item.command.getPromptRowCount();
const commandRowCount = item.command.getCommandRowCount();
xterm.markTracker.revealRange({
start: {
x: 1,
y: item.command.marker.line - (promptRowCount - 1) + 1
},
end: {
x: instance.cols,
y: item.command.marker.line + (commandRowCount - 1) + 1
}
});
} else {
terminalScrollStateSaved = false;
xterm.markTracker.restoreScrollState();
restoreScrollState();
}
});
quickPick.onDidAccept(async () => {
@ -289,13 +304,9 @@ export async function showRunRecentQuickPick(
if (quickPick.keyMods.alt) {
instance.focus();
}
terminalScrollStateSaved = false;
instance.xterm?.markTracker.restoreScrollState();
});
quickPick.onDidHide(() => {
terminalScrollStateSaved = false;
instance.xterm?.markTracker.restoreScrollState();
restoreScrollState();
});
quickPick.onDidHide(() => restoreScrollState());
if (value) {
quickPick.value = value;
}