h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-04-19 06:31:13 -03:00
Code Issues Packages Projects Releases Wiki Activity

Future-proof text style resetting logic

Browse Source 
Some text styles don't have way of unsetting them specifically, so we use
CSI m. Let's make this the default action.
This commit is contained in:
Johannes Altmanninger
2025-04-13 15:38:56 +02:00
parent 45a13a0075
commit 69aa492d40
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/terminal.rs
View File

@@ -495,7 +495,9 @@ pub(crate) fn reset_text_face(&mut self, weird_workaround: bool) {
/// color pair to what it should be.
#[allow(clippy::if_same_then_else)]
pub(crate) fn set_text_face(&mut self, face: TextFace) {
let TextFace { mut fg, bg, .. } = face;
let mut fg = face.fg;
let bg = face.bg;
let style = face.style;
let mut bg_set = false;
let mut last_bg_set = false;
let is_bold = face.is_bold();
@@ -512,11 +514,11 @@ pub(crate) fn set_text_face(&mut self, face: TextFace) {
EnterBoldMode, EnterDimMode, EnterItalicsMode, EnterReverseMode, EnterStandoutMode,
EnterUnderlineMode, ExitAttributeMode, ExitItalicsMode, ExitUnderlineMode,
};
if (self.last.is_bold() && !is_bold)
|| (self.last.is_dim() && !is_dim)
|| (self.last.is_reverse() && !is_reverse)
{
// Only way to exit bold/dim/reverse mode is a reset of all attributes.
let non_resettable = |style| style & !(TextStyling::ITALICS | TextStyling::UNDERLINE);
let non_resettable_attributes_to_unset =
non_resettable(self.last.style).difference(non_resettable(style));
if !non_resettable_attributes_to_unset.is_empty() {
// Only way to exit non-resettable ones is a reset of all attributes.
self.reset_text_face(false);
}
if !self.last.bg.is_special() {
@@ -598,7 +600,6 @@ pub(crate) fn set_text_face(&mut self, face: TextFace) {
if is_dim && !self.last.is_dim() && self.write_command(EnterDimMode) {
self.last.style.set(TextStyling::DIM, is_dim);
}
// N.B. there is no exit_dim_mode, it's handled by exit_attribute_mode above.
if is_reverse && !self.last.is_reverse() {
if self.write_command(EnterReverseMode) || self.write_command(EnterStandoutMode) {