From 841e717f7a9cdd6d0c5b070e21822a4f434afc08 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Wed, 14 Dec 2022 14:42:18 -0600 Subject: [PATCH] fix #168624 --- src/vs/workbench/contrib/terminal/browser/terminal.ts | 3 ++- src/vs/workbench/contrib/terminal/browser/terminalActions.ts | 2 +- .../contrib/terminal/browser/xterm/markNavigationAddon.ts | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.ts b/src/vs/workbench/contrib/terminal/browser/terminal.ts index 3923020b3f123..232e5d34e3cf0 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminal.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminal.ts @@ -18,6 +18,7 @@ import { EditorInput } from 'vs/workbench/common/editor/editorInput'; import { IEditableData } from 'vs/workbench/common/views'; import { TerminalFindWidget } from 'vs/workbench/contrib/terminal/browser/terminalFindWidget'; import { ITerminalStatusList } from 'vs/workbench/contrib/terminal/browser/terminalStatusList'; +import { ScrollPosition } from 'vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon'; import { ITerminalQuickFixAddon } from 'vs/workbench/contrib/terminal/browser/xterm/quickFixAddon'; import { INavigationMode, IRegisterContributedProfileArgs, IRemoteTerminalAttachTarget, IStartExtensionTerminalRequest, ITerminalBackend, ITerminalConfigHelper, ITerminalFont, ITerminalProcessExtHostProxy } from 'vs/workbench/contrib/terminal/common/terminal'; import { EditorGroupColumn } from 'vs/workbench/services/editor/common/editorGroupColumn'; @@ -85,7 +86,7 @@ export interface IQuickPickTerminalObject { } export interface IMarkTracker { - scrollToPreviousMark(): void; + scrollToPreviousMark(scrollPosition?: ScrollPosition, retainSelection?: boolean, skipEmptyCommands?: boolean): void; scrollToNextMark(): void; selectToPreviousMark(): void; selectToNextMark(): void; diff --git a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts index 07eb9cd3a0ded..f696719b5d31c 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts @@ -1215,7 +1215,7 @@ export function registerTerminalActions() { } run(accessor: ServicesAccessor) { accessor.get(ITerminalService).doWithActiveInstance(t => { - t.xterm?.markTracker.scrollToPreviousMark(); + t.xterm?.markTracker.scrollToPreviousMark(undefined, undefined, t.capabilities.has(TerminalCapability.CommandDetection)); }); } }); diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts b/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts index fa5547da7863b..8a3bdaeaa86ab 100644 --- a/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts +++ b/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts @@ -93,7 +93,7 @@ export class MarkNavigationAddon extends Disposable implements IMarkTracker, ITe return this._getMarkers(true).indexOf(marker) === -1; } - scrollToPreviousMark(scrollPosition: ScrollPosition = ScrollPosition.Middle, retainSelection: boolean = false, skipEmptyCommands?: boolean): void { + scrollToPreviousMark(scrollPosition: ScrollPosition = ScrollPosition.Middle, retainSelection: boolean = false, skipEmptyCommands: boolean = false): void { if (!this._terminal) { return; }