mat/azalea
1
2
Fork 0
mirror of https://github.com/mat-1/azalea.git synced 2025-08-02 14:26:04 +00:00
Code Issues Projects Releases Packages Activity

Fix ascii conversion cleanup

Browse source
This commit is contained in:
Kumpelinus 2025-03-20 22:15:57 +01:00
parent 210af2916d
commit bf2bfd3bcb
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
azalea-chat/src/component.rs
View file

@ -67,15 +67,17 @@ impl FormattedText {
}
}
pub fn to_custom_format<F, S>(
pub fn to_custom_format<F, S, C>(
&self,
mut style_formatter: F,
mut text_formatter: S,
mut cleanup_formatter: C,
default_style: &Style,
) -> String
where
F: FnMut(&Style, &Style, &Style) -> (String, String),
S: FnMut(&str) -> String,
C: FnMut(&Style) -> String,
{
let mut output = String::new();
let mut running_style = Style::default();
@ -106,6 +108,8 @@ impl FormattedText {
}
}
output.push_str(&cleanup_formatter(&running_style));
output
}
@ -131,17 +135,12 @@ impl FormattedText {
/// println!("{}", component.to_ansi());
/// ```
pub fn to_ansi(&self) -> String {
let mut result = self.to_custom_format(
self.to_custom_format(
|running, new, default| (running.compare_ansi(new, default), "".to_owned()),
|text| text.to_string(),
|style| if !style.is_empty() { "\u{1b}[m" } else { "" }.to_string(),
&DEFAULT_STYLE,
);
if !result.is_empty() {
result.push_str("\u{1b}[m");
}
result
)
}
pub fn to_html(&self) -> String {
@ -153,6 +152,7 @@ impl FormattedText {
)
},
|text| text.replace("\n", "<br>"),
|_| "".to_string(),
&DEFAULT_STYLE,
)
}