Skip to content

fix ansi_html() when same style repeated #807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
trevorld wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix ansi_html() when same style repeated #807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/ansi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,13 @@ static void clic__html_start(struct html_data *data) {
static void clic__html_end(struct html_data *data) {

struct cli_buffer *buffer = &data->buffer;
if (data->had_tags) EMITS("</span>");
if (data->had_tags) {
EMITS("</span>");
/* Reset old state after closing tags, so the next text segment
correctly detects that it needs to open a new span, even if
the same style was reset and re-applied (issue #752). */
memset(&data->state.old, 0, sizeof(data->state.old));
}
if (data->is_link) EMITS("</a>");
}

Expand Down
13 changes: 13 additions & 0 deletions tests/testthat/test-ansi-html.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,16 @@ test_that("ansi_html_style", {
ansi_html_style(colors = 256, palette = "ubuntu")
)
})

# https://github.com/r-lib/cli/issues/752
test_that("consecutive strings with the same style pasted together", {
x <- "\033[91mR\033[39m\033[91mR\033[39m"
expect_equal(
ansi_html(x),
"<span class=\"ansi ansi-color-1\">R</span><span class=\"ansi ansi-color-1\">R</span>"
)
expect_equal(
ansi_html(ansi_simplify(x)),
"<span class=\"ansi ansi-color-1\">RR</span>"
)
})
Loading