youwen/iamb
1
0
Fork 0
mirror of https://github.com/youwen5/iamb.git synced 2025-08-04 19:48:28 -07:00
Code Issues Projects Releases Packages Wiki Activity

Fix display of tabs in code blocks (#463)

Browse source
This commit is contained in:
VAWVAW 2025-06-17 01:30:07 +00:00 • committed by GitHub
parent 33d3407694
commit 9e40b49e5e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 36 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/message/html.rs
View file

@ -1415,13 +1415,14 @@ pub mod tests {
let s = concat!(
"<pre><code class=\"language-rust\">",
"fn hello() -&gt; usize {\n",
" \t// weired\n",
" return 5;\n",
"}\n",
"</code></pre>\n"
);
let tree = parse_matrix_html(s);
let text = tree.to_text(25, Style::default(), true, &settings);
assert_eq!(text.lines.len(), 5);
assert_eq!(text.lines.len(), 6);
assert_eq!(
text.lines[0],
Line::from(vec![
@ -1452,6 +1453,20 @@ pub mod tests {
);
assert_eq!(
text.lines[2],
Line::from(vec![
Span::raw(line::VERTICAL),
Span::raw(" "),
Span::raw(" "),
Span::raw("/"),
Span::raw("/"),
Span::raw(" "),
Span::raw("weired"),
Span::raw(" "),
Span::raw(line::VERTICAL)
])
);
assert_eq!(
text.lines[3],
Line::from(vec![
Span::raw(line::VERTICAL),
Span::raw(" "),
@ -1464,7 +1479,7 @@ pub mod tests {
])
);
assert_eq!(
text.lines[3],
text.lines[4],
Line::from(vec![
Span::raw(line::VERTICAL),
Span::raw("}"),
@ -1473,7 +1488,7 @@ pub mod tests {
])
);
assert_eq!(
text.lines[4],
text.lines[5],
Line::from(vec![
Span::raw(line::BOTTOM_LEFT),
Span::raw(line::HORIZONTAL.repeat(23)),

10
src/message/printer.rs
View file

@ -216,6 +216,8 @@ impl<'a> TextPrinter<'a> {
return;
}
let tabstop = self.settings().tunables.tabstop;
for mut word in UnicodeSegmentation::split_word_bounds(s) {
if let "\n" | "\r\n" = word {
if self.literal {
@ -232,11 +234,17 @@ impl<'a> TextPrinter<'a> {
continue;
}
let cow = if self.emoji_shortcodes() {
let mut cow = if self.emoji_shortcodes() {
Cow::Owned(replace_emojis_in_str(word))
} else {
Cow::Borrowed(word)
};
if cow == "\t" {
let tablen = tabstop - (self.curr_width % tabstop);
cow = Cow::Owned(" ".repeat(tablen));
}
let sw = UnicodeWidthStr::width(cow.as_ref());
if sw > self.width {