Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 20:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow terminal sticky scroll only when rich shell integration (#261161)

Browse Source 
* Initial plan

* Fix sticky scroll to require rich shell integration

Co-authored-by: anthonykim1 <62267334+anthonykim1@users.noreply.github.com>

* Remove redundant comment from terminal sticky scroll

Co-authored-by: anthonykim1 <62267334+anthonykim1@users.noreply.github.com>

* move richCommandDetection check to _tryEnable

* last cleanup

* rewrite _tryEnable() as suggested.

* clear richDetectionListener

* also clear when rich command detection is already there

* cover no shell int, rich shell int, basic shell int

* Don't leave a mess

* Make conditional more explicit

---------

Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
Co-authored-by: anthonykim1 <62267334+anthonykim1@users.noreply.github.com>
Co-authored-by: Anthony Kim <anthonykim@microsoft.com>
This commit is contained in:
Copilot
2025-08-16 04:42:54 +00:00
committed by GitHub
parent 41662b9e3b
commit e98a20f554
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollContribution.ts
View File

@@ -31,6 +31,7 @@ export class TerminalStickyScrollContribution extends Disposable implements ITer
private readonly _enableListeners = this._register(new MutableDisposable());
private readonly _disableListeners = this._register(new MutableDisposable());
private readonly _richCommandDetectionListeners = this._register(new MutableDisposable());
constructor(
private readonly _ctx: ITerminalContributionContext,
@@ -94,6 +95,7 @@ export class TerminalStickyScrollContribution extends Disposable implements ITer
}
private _tryEnable(): void {
const capability = this._ctx.instance.capabilities.get(TerminalCapability.CommandDetection);
if (this._shouldBeEnabled()) {
const xtermCtorEventually = TerminalInstance.getXtermConstructor(this._keybindingService, this._contextKeyService);
this._overlay.value = this._instantiationService.createInstance(
@@ -101,20 +103,30 @@ export class TerminalStickyScrollContribution extends Disposable implements ITer
this._ctx.instance,
this._xterm!,
this._instantiationService.createInstance(TerminalInstanceColorProvider, this._ctx.instance.targetRef),
this._ctx.instance.capabilities.get(TerminalCapability.CommandDetection)!,
capability!,
xtermCtorEventually
);
this._richCommandDetectionListeners.clear();
} else if (capability && !capability.hasRichCommandDetection) {
this._richCommandDetectionListeners.value = capability.onSetRichCommandDetection(() => {
this._refreshState();
});
} else {
// No or Rich shell integration does not need listener
this._richCommandDetectionListeners.clear();
}
}
private _tryDisable(): void {
if (!this._shouldBeEnabled()) {
this._overlay.clear();
this._richCommandDetectionListeners.clear();
}
}
private _shouldBeEnabled(): boolean {
const capability = this._ctx.instance.capabilities.get(TerminalCapability.CommandDetection);
return !!(this._configurationService.getValue(TerminalStickyScrollSettingId.Enabled) && capability && this._xterm?.raw?.element);
const result = !!(this._configurationService.getValue(TerminalStickyScrollSettingId.Enabled) && capability && capability.hasRichCommandDetection && this._xterm?.raw?.element);
return result;
}
}