From 86070515dce61537185bffde078acaeb4bd16acc Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Tue, 5 Nov 2024 06:34:13 -0800 Subject: [PATCH 1/2] Call out fontFamily in ligatures setting Part of #34103 --- .../contrib/terminal/common/terminalConfiguration.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts index 8c1aae89da48d..d0c2f551ba8f9 100644 --- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts +++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts @@ -172,10 +172,10 @@ const terminalConfiguration: IConfigurationNode = { type: 'string' }, [TerminalSettingId.FontLigatures]: { - description: localize('terminal.integrated.fontLigatures', "Controls whether font ligatures are enabled in the terminal."), + description: localize('terminal.integrated.fontLigatures', "Controls whether font ligatures are enabled in the terminal. Ligatures will only work if the configured {0} supports them.", `\`#${TerminalSettingId.FontFamily}#\``), type: 'boolean', tags: ['preview'], - 'default': false + default: false }, [TerminalSettingId.FontSize]: { description: localize('terminal.integrated.fontSize', "Controls the font size in pixels of the terminal."), From f6b354000096b9ae87bfc82e7b5ad60c64d4a1cc Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Tue, 5 Nov 2024 06:44:43 -0800 Subject: [PATCH 2/2] Fix link in ligatures setting --- .../workbench/contrib/terminal/common/terminalConfiguration.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts index d0c2f551ba8f9..845c769029e31 100644 --- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts +++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts @@ -172,7 +172,7 @@ const terminalConfiguration: IConfigurationNode = { type: 'string' }, [TerminalSettingId.FontLigatures]: { - description: localize('terminal.integrated.fontLigatures', "Controls whether font ligatures are enabled in the terminal. Ligatures will only work if the configured {0} supports them.", `\`#${TerminalSettingId.FontFamily}#\``), + markdownDescription: localize('terminal.integrated.fontLigatures', "Controls whether font ligatures are enabled in the terminal. Ligatures will only work if the configured {0} supports them.", `\`#${TerminalSettingId.FontFamily}#\``), type: 'boolean', tags: ['preview'], default: false