Skip to content

Commit 61f2c67

Browse files
authored
Merge pull request microsoft#235752 from microsoft/tyriar/198622
Clarify sixel support on Windows, mention conpty version
2 parents f20fe4d + a5539ae commit 61f2c67

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ const terminalConfiguration: IConfigurationNode = {
460460
default: true
461461
},
462462
[TerminalSettingId.ExperimentalWindowsUseConptyDll]: {
463-
markdownDescription: localize('terminal.integrated.experimentalWindowsUseConptyDll', "Whether to use the experimental conpty.dll shipped with VS Code, instead of the one bundled with Windows."),
463+
markdownDescription: localize('terminal.integrated.experimentalWindowsUseConptyDll', "Whether to use the experimental conpty.dll (v1.20.240626001) shipped with VS Code, instead of the one bundled with Windows."),
464464
type: 'boolean',
465465
default: false
466466
},
@@ -590,7 +590,7 @@ const terminalConfiguration: IConfigurationNode = {
590590
},
591591
[TerminalSettingId.EnableImages]: {
592592
restricted: true,
593-
markdownDescription: localize('terminal.integrated.enableImages', "Enables image support in the terminal, this will only work when {0} is enabled. Both sixel and iTerm's inline image protocol are supported on Linux and macOS, Windows support will light up automatically when ConPTY passes through the sequences. Images will currently not be restored between window reloads/reconnects.", `\`#${TerminalSettingId.GpuAcceleration}#\``),
593+
markdownDescription: localize('terminal.integrated.enableImages', "Enables image support in the terminal, this will only work when {0} is enabled. Both sixel and iTerm's inline image protocol are supported on Linux and macOS. This will only work on Windows for versions of ConPTY >= v2 which is shipped with Windows itself, see also {1}. Images will currently not be restored between window reloads/reconnects.", `\`#${TerminalSettingId.GpuAcceleration}#\``, `\`#${TerminalSettingId.ExperimentalWindowsUseConptyDll}#\``),
594594
type: 'boolean',
595595
default: false
596596
},

0 commit comments

Comments
 (0)