Respect undercurl config even with no terminfo (#9897)

I have just found out that my recent Windows Terminal version
supported rendering undercurl (see
https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-20-release
). However, looking at the source, terminfo is required for helix to
emit the undercurl control code, which isn't available on Windows AFAIK.

This commit make helix respects the `editor.undercurl` option when
there is no terminfo.

Tested on Windows Terminal Preview 1.20

Signed-off-by: Khang Nguyen <khang.nguyenduycse@hcmut.edu.vn>
pull/9900/head
Khang Nguyen Duy 8 months ago committed by GitHub
parent 3d4889ce9a
commit 4d2282cbcc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -52,10 +52,14 @@ impl Default for Capabilities {
impl Capabilities { impl Capabilities {
/// Detect capabilities from the terminfo database located based /// Detect capabilities from the terminfo database located based
/// on the $TERM environment variable. If detection fails, returns /// on the $TERM environment variable. If detection fails, returns
/// a default value where no capability is supported. /// a default value where no capability is supported, or just undercurl
/// if config.undercurl is set.
pub fn from_env_or_default(config: &EditorConfig) -> Self { pub fn from_env_or_default(config: &EditorConfig) -> Self {
match termini::TermInfo::from_env() { match termini::TermInfo::from_env() {
Err(_) => Capabilities::default(), Err(_) => Capabilities {
has_extended_underlines: config.undercurl,
..Capabilities::default()
},
Ok(t) => Capabilities { Ok(t) => Capabilities {
// Smulx, VTE: https://unix.stackexchange.com/a/696253/246284 // Smulx, VTE: https://unix.stackexchange.com/a/696253/246284
// Su (used by kitty): https://sw.kovidgoyal.net/kitty/underlines // Su (used by kitty): https://sw.kovidgoyal.net/kitty/underlines

Loading…
Cancel
Save