Skip to content
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

Jump to bottom

Offset terminal when inline chat appears to ensure cursor is visible #210239

Merged
merged 2 commits into from
Apr 12, 2024
Merged

Offset terminal when inline chat appears to ensure cursor is visible #210239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9675a34
Offset terminal when inline chat appears to ensure cursor is visible
Tyriar Apr 12, 2024
08d545f
Fix vertical offset value
Tyriar Apr 12, 2024
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
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ export class TerminalChatController extends Disposable implements ITerminalContr

xtermReady(xterm: IXtermTerminal & { raw: RawXtermTerminal }): void {
this._chatWidget = new Lazy(() => {
const chatWidget = this._register(this._instantiationService.createInstance(TerminalChatWidget, this._instance.domElement!, this._instance));
const chatWidget = this._register(this._instantiationService.createInstance(TerminalChatWidget, this._instance.domElement!, this._instance, xterm));
this._register(chatWidget.focusTracker.onDidFocus(() => {
TerminalChatController.activeChatWidget = this;
if (!isDetachedTerminalInstance(this._instance)) {
Expand Down
24 changes: 22 additions & 2 deletions src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,21 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import type { Terminal as RawXtermTerminal } from '@xterm/xterm';
import { Dimension, IFocusTracker, trackFocus } from 'vs/base/browser/dom';
import { Event } from 'vs/base/common/event';
import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
import { MicrotaskDelay } from 'vs/base/common/symbols';
import 'vs/css!./media/terminalChatWidget';
import { localize } from 'vs/nls';
import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
import { IChatProgress } from 'vs/workbench/contrib/chat/common/chatService';
import { InlineChatWidget } from 'vs/workbench/contrib/inlineChat/browser/inlineChatWidget';
import { ITerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
import { ITerminalInstance, type IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
import { MENU_TERMINAL_CHAT_INPUT, MENU_TERMINAL_CHAT_WIDGET, MENU_TERMINAL_CHAT_WIDGET_FEEDBACK, MENU_TERMINAL_CHAT_WIDGET_STATUS, TerminalChatCommandId, TerminalChatContextKeys } from 'vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
import { TerminalStickyScrollContribution } from 'vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollContribution';

const enum Constants {
HorizontalMargin = 10
Expand All @@ -35,6 +38,7 @@ export class TerminalChatWidget extends Disposable {
constructor(
private readonly _terminalElement: HTMLElement,
private readonly _instance: ITerminalInstance,
private readonly _xterm: IXtermTerminal & { raw: RawXtermTerminal },
@IInstantiationService private readonly _instantiationService: IInstantiationService,
@IContextKeyService private readonly _contextKeyService: IContextKeyService
) {
Expand Down Expand Up @@ -73,6 +77,7 @@ export class TerminalChatWidget extends Disposable {
this._register(Event.any(
this._inlineChatWidget.onDidChangeHeight,
this._instance.onDimensionsChanged,
Event.debounce(this._xterm.raw.onCursorMove, () => void 0, MicrotaskDelay),
)(() => this._relayout()));

const observer = new ResizeObserver(() => this._relayout());
Expand Down Expand Up @@ -102,6 +107,7 @@ export class TerminalChatWidget extends Disposable {
}
this._dimension = new Dimension(width, height);
this._inlineChatWidget.layout(this._dimension);

this._updateVerticalPosition();
}

Expand Down Expand Up @@ -134,7 +140,9 @@ export class TerminalChatWidget extends Disposable {
return;
}
if (top > terminalWrapperHeight - widgetHeight) {
this._container.style.top = '';
this._setTerminalOffset(top - (terminalWrapperHeight - widgetHeight));
} else {
this._setTerminalOffset(undefined);
}
}

Expand All @@ -154,6 +162,18 @@ export class TerminalChatWidget extends Disposable {
this._visibleContextKey.set(false);
this._inlineChatWidget.value = '';
this._instance.focus();
this._setTerminalOffset(undefined);
}
private _setTerminalOffset(offset: number | undefined) {
if (offset === undefined || this._container.classList.contains('hide')) {
this._terminalElement.style.position = '';
this._terminalElement.style.bottom = '';
TerminalStickyScrollContribution.get(this._instance)?.hideUnlock();
} else {
this._terminalElement.style.position = 'relative';
this._terminalElement.style.bottom = `${offset}px`;
TerminalStickyScrollContribution.get(this._instance)?.hideLock();
}
}
focus(): void {
this._inlineChatWidget.focus();
Expand Down
8 changes: 8 additions & 0 deletions ...orkbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollContribution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,14 @@ export class TerminalStickyScrollContribution extends Disposable implements ITer
this._refreshState();
}

hideLock() {
this._overlay.value?.lockHide();
}

hideUnlock() {
this._overlay.value?.unlockHide();
}
Comment on lines +63 to +69
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this terminology is a bit confusing ... could it just be lock and unlock? vs hideLock and hideUnlock

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lock and unlock by themselves seem like they'd be related to positioning. Also it has another hide mechanism that this overrides


private _refreshState(): void {
if (this._overlay.value) {
this._tryDisable();
Expand Down
8 changes: 8 additions & 0 deletions src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,14 @@ export class TerminalStickyScrollOverlay extends Disposable {
});
}

lockHide() {
this._element?.classList.add('lock-hide');
}

unlockHide() {
this._element?.classList.remove('lock-hide');
}

private _setState(state: OverlayState) {
if (this._state === state) {
return;
Expand Down
Loading