Merge remote-tracking branch 'origin/main'

Author: gaborcsardi

R/cliapp-docs.R

@@ -80,6 +80,7 @@
 #' * `run` is an R expression, that is potentially clickable if the terminal
 #'   supports ANSI hyperlinks to runnable code (e.g. RStudio).
 #'   It supports link text. See [links] for more about cli hyperlinks.
+#' * `str` for a double quoted string escaped by [base::encodeString()].
 #' * `strong` for strong importance.
 #' * `topic` is a help page of a _ropic_.
 #'   If the terminal supports ANSI hyperlinks to help pages (e.g. RStudio),

R/diff.R

@@ -167,7 +167,7 @@ get_diff_chunks <- function(lcs, context = 3L) {
 
   # chunk starts at operation number sum(length) before it, plus 1, but
   # at the end we change this to include the context chunks are well
-  chunks$op_begin  <- c(0, cumsum(runs$length))[which(runs$values)] + 1
+  chunks$op_begin  <- c(0, cumsum(runs$lengths))[which(runs$values)] + 1
   chunks$op_length <- runs$lengths[runs$values]
 
   # `old` positions are from `old_off`, but need to fix the boundaries