Skip to content

Commit 5fc7d03

Browse files
committed
Make ligatures a preview setting
1 parent dfb1316 commit 5fc7d03

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

src/vs/platform/terminal/common/terminal.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ export const enum TerminalSettingId {
116116
SmoothScrolling = 'terminal.integrated.smoothScrolling',
117117
IgnoreBracketedPasteMode = 'terminal.integrated.ignoreBracketedPasteMode',
118118
FocusAfterRun = 'terminal.integrated.focusAfterRun',
119-
ExperimentalFontLigatures = 'terminal.integrated.experimental.fontLigatures',
119+
FontLigatures = 'terminal.integrated.fontLigatures',
120120

121121
// Debug settings that are hidden from user
122122

src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
718718
if (!this.raw.element) {
719719
return;
720720
}
721-
if (this._terminalConfigurationService.config.experimental?.fontLigatures) {
721+
if (this._terminalConfigurationService.config.fontLigatures) {
722722
if (!this._ligaturesAddon.value) {
723723
this._xtermAddonLoader.importAddon('ligatures').then(LigaturesAddon => {
724724
if (this._store.isDisposed) {

src/vs/workbench/contrib/terminal/common/terminal.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ export interface ITerminalConfiguration {
207207
smoothScrolling: boolean;
208208
ignoreBracketedPasteMode: boolean;
209209
rescaleOverlappingGlyphs: boolean;
210+
fontLigatures?: boolean;
210211
experimental?: {
211212
windowsUseConptyDll?: boolean;
212-
fontLigatures?: boolean;
213213
};
214214
}
215215

src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,10 @@ const terminalConfiguration: IConfigurationNode = {
171171
markdownDescription: localize('terminal.integrated.fontFamily', "Controls the font family of the terminal. Defaults to {0}'s value.", '`#editor.fontFamily#`'),
172172
type: 'string'
173173
},
174-
[TerminalSettingId.ExperimentalFontLigatures]: {
175-
'description': localize('terminal.integrated.fontLigatures', "Controls whether font ligatures are enabled in the terminal."),
176-
'type': 'boolean',
174+
[TerminalSettingId.FontLigatures]: {
175+
description: localize('terminal.integrated.fontLigatures', "Controls whether font ligatures are enabled in the terminal."),
176+
type: 'boolean',
177+
tags: ['preview'],
177178
'default': false
178179
},
179180
[TerminalSettingId.FontSize]: {

0 commit comments

Comments
 (0)