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

set terminal hint font, font size to that of terminal, fix bug (#212623)

Browse source
This commit is contained in:
Megan Rogge 2024-05-13 10:34:08 -07:00 committed by GitHub
parent 59018d4606
commit 3497513f6b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.initialHint.contribution.ts
View file

@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { Disposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
import { IDetachedTerminalInstance, ITerminalContribution, ITerminalInstance, ITerminalService, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
import { IDetachedTerminalInstance, ITerminalContribution, ITerminalEditorService, ITerminalGroupService, ITerminalInstance, ITerminalService, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
import { registerTerminalContribution } from 'vs/workbench/contrib/terminal/browser/terminalExtensions';
import type { Terminal as RawXtermTerminal, IDecoration, ITerminalAddon } from '@xterm/xterm';
import { TerminalWidgetManager } from 'vs/workbench/contrib/terminal/browser/widgets/widgetManager';
@ -83,13 +83,14 @@ export class TerminalInitialHintContribution extends Disposable implements ITerm
@IInlineChatService private readonly _inlineChatService: IInlineChatService,
@IInstantiationService private readonly _instantiationService: IInstantiationService,
@IConfigurationService private readonly _configurationService: IConfigurationService,
@ITerminalService private readonly _terminalService: ITerminalService
@ITerminalGroupService private readonly _terminalGroupService: ITerminalGroupService,
@ITerminalEditorService private readonly _terminalEditorService: ITerminalEditorService,
) {
super();
}
xtermOpen(xterm: IXtermTerminal & { raw: RawXtermTerminal }): void {
if (this._terminalService.instances.length !== 1) {
if (this._terminalGroupService.instances.length + this._terminalEditorService.instances.length !== 1) {
// only show for the first terminal
return;
}
@ -135,7 +136,7 @@ export class TerminalInitialHintContribution extends Disposable implements ITerm
}
this._register(this._decoration);
this._register(this._decoration.onRender((e) => {
if (!this._hintWidget && this._xterm?.isFocused && this._terminalService.instances.length === 1) {
if (!this._hintWidget && this._xterm?.isFocused && this._terminalGroupService.instances.length + this._terminalEditorService.instances.length === 1) {
const chatProviders = [...this._inlineChatService.getAllProvider()];
if (chatProviders?.length) {
const widget = this._register(this._instantiationService.createInstance(TerminalInitialHintWidget, instance));
@ -146,6 +147,11 @@ export class TerminalInitialHintContribution extends Disposable implements ITerm
}
e.appendChild(this._hintWidget);
e.classList.add('terminal-initial-hint');
const font = this._xterm.getFont();
if (font) {
e.style.fontFamily = font.fontFamily;
e.style.fontSize = font.fontSize + 'px';
}
}
}
if (this._hintWidget && this._xterm) {