Skip to content

Fix VT segment numbering #831

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
sims1253 wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −14
Open

Fix VT segment numbering #831

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
2 changes: 1 addition & 1 deletion R/vt.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ vt_output <- function(output, width = 80L, height = 25L) {
data.frame(
stringsAsFactors = FALSE,
lineno = i,
segmentno = seq_along(segments),
segmentno = seq_along(segs),
segment = segs,
bold = grepl("bold;", lgs$values, fixed = TRUE),
italic = grepl("italic;", lgs$values, fixed = TRUE),
Expand Down
26 changes: 13 additions & 13 deletions tests/testthat/_snaps/vt.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@
Output
lineno segmentno segment bold italic underline strikethrough
1 1 1 12 FALSE FALSE FALSE FALSE
2 1 1 34 FALSE FALSE FALSE FALSE
3 1 1 56 TRUE FALSE FALSE FALSE
4 1 1 78 TRUE FALSE FALSE FALSE
5 1 1 90 FALSE FALSE FALSE FALSE
2 1 2 34 FALSE FALSE FALSE FALSE
3 1 3 56 TRUE FALSE FALSE FALSE
4 1 4 78 TRUE FALSE FALSE FALSE
5 1 5 90 FALSE FALSE FALSE FALSE
6 2 1 FALSE FALSE FALSE FALSE
blink inverse color background_color link link_params
1 FALSE FALSE <NA> <NA> <NA> <NA>
Expand All @@ -74,7 +74,7 @@
Output
lineno segmentno segment bold italic underline strikethrough
1 1 1 I'm bold TRUE FALSE FALSE FALSE
2 1 1 FALSE FALSE FALSE FALSE
2 1 2 FALSE FALSE FALSE FALSE
3 2 1 FALSE FALSE FALSE FALSE
blink inverse color background_color link link_params
1 FALSE FALSE <NA> <NA> <NA> <NA>
Expand All @@ -88,7 +88,7 @@
Output
lineno segmentno segment bold italic underline strikethrough
1 1 1 I'm italic FALSE TRUE FALSE FALSE
2 1 1 FALSE FALSE FALSE FALSE
2 1 2 FALSE FALSE FALSE FALSE
3 2 1 FALSE FALSE FALSE FALSE
blink inverse color background_color link link_params
1 FALSE FALSE <NA> <NA> <NA> <NA>
Expand All @@ -102,7 +102,7 @@
Output
lineno segmentno segment bold italic underline strikethrough
1 1 1 I'm underlined FALSE FALSE TRUE FALSE
2 1 1 FALSE FALSE FALSE FALSE
2 1 2 FALSE FALSE FALSE FALSE
3 2 1 FALSE FALSE FALSE FALSE
blink inverse color background_color link link_params
1 FALSE FALSE <NA> <NA> <NA> <NA>
Expand All @@ -116,7 +116,7 @@
Output
lineno segmentno segment bold italic underline strikethrough
1 1 1 I'm strikethrough FALSE FALSE FALSE TRUE
2 1 1 FALSE FALSE FALSE FALSE
2 1 2 FALSE FALSE FALSE FALSE
3 2 1 FALSE FALSE FALSE FALSE
blink inverse color background_color link link_params
1 FALSE FALSE <NA> <NA> <NA> <NA>
Expand All @@ -130,7 +130,7 @@
Output
lineno segmentno segment bold italic underline strikethrough
1 1 1 I'm inverse FALSE FALSE FALSE FALSE
2 1 1 FALSE FALSE FALSE FALSE
2 1 2 FALSE FALSE FALSE FALSE
3 2 1 FALSE FALSE FALSE FALSE
blink inverse color background_color link link_params
1 FALSE TRUE <NA> <NA> <NA> <NA>
Expand All @@ -145,8 +145,8 @@
Output
lineno segmentno segment bold italic underline strikethrough
1 1 1 pre FALSE FALSE FALSE FALSE
2 1 1 text FALSE FALSE FALSE FALSE
3 1 1 post FALSE FALSE FALSE FALSE
2 1 2 text FALSE FALSE FALSE FALSE
3 1 3 post FALSE FALSE FALSE FALSE
4 2 1 FALSE FALSE FALSE FALSE
blink inverse color background_color link link_params
1 FALSE FALSE <NA> <NA> <NA> <NA>
Expand All @@ -162,8 +162,8 @@
Output
lineno segmentno segment bold italic underline strikethrough
1 1 1 pre FALSE FALSE FALSE FALSE
2 1 1 text FALSE FALSE FALSE FALSE
3 1 1 post FALSE FALSE FALSE FALSE
2 1 2 text FALSE FALSE FALSE FALSE
3 1 3 post FALSE FALSE FALSE FALSE
4 2 1 FALSE FALSE FALSE FALSE
blink inverse color background_color link link_params
1 FALSE FALSE <NA> <NA> <NA> <NA>
Expand Down
6 changes: 6 additions & 0 deletions tests/testthat/test-vt.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ test_that_cli(configs = "ansi", "ANSI SGR", {
)
})

test_that("segments are numbered within each line", {
output <- vt_output("a\033[31mb\033[32mc", width = 3, height = 1)

expect_equal(output$segmentno, 1:3)
})

test_that("hyperlinks", {
withr::local_options(cli.hyperlink = TRUE)
expect_snapshot({
Expand Down
Loading