Merge pull request #769 from vaerksted/main

Author: gaborcsardi

NEWS.md

@@ -50,7 +50,7 @@
 * `ansi_collapse(x, trunc = 1, style = "head")` now indeed shows one
   element if `length(x) == 2`, as documented (@salim-b, #572).
 
-* `ansi_collapse()` gains a `sep2` argument to specify a seperate separator
+* `ansi_collapse()` gains a `sep2` argument to specify a separate separator
   for length-two inputs. It defaults to `" and "` which, in conjunction with
   the other defaults, produces a collapsed string that fully adheres to the
   [serial comma](https://en.wikipedia.org/wiki/Serial_comma) rules.
@@ -147,7 +147,7 @@
 * cli exit handlers are now compatible again with the withr package (#437).
 
 * cli functions now keep trailing `\f` characters as newlines.
-  They also keep multiple consecutive `\f` as multiple newlinees (#491).
+  They also keep multiple consecutive `\f` as multiple newlines (#491).
 
 * `{}` substitutions within inline styles are now formatted correctly.
   E.g. `{.code download({url})}` will not add backticks to `url`, and

R/ansiex.R

@@ -393,7 +393,7 @@ ansi_strsplit <- function(x, split, ...) {
 #' @family ANSI string operations
 #' @export
 
-# TODO: show wide Unicode charadcters, once they work in asciicast
+# TODO: show wide Unicode characters, once they work in asciicast
 
 ansi_align <- function(
   text,
@@ -572,7 +572,7 @@ ansi_strwrap <- function(
         xs <- xs[-1]
       }
       # At this point, we have as many marks as many newlines we need
-      # But (except for the begnning) we need one less empty lines than
+      # But (except for the beginning) we need one less empty lines than
       # newlines, because an empty line corresponds to two newlines at
       # the end of a non-empty line.
       del <- which(xs[-1] == mark & xs[-length(xs)] != mark) + 1L
@@ -1120,7 +1120,7 @@ ansi_grep_internal <- function(fun, pattern, x, ...) {
 
 #' Like [base::nzchar()], but for ANSI strings
 #'
-#' @param x Charcater vector. Other objects are coarced using
+#' @param x Character vector. Other objects are coerced using
 #'   [base::as.character()].
 #' @param ... Passed to [base::nzchar()].
 #' @export

R/cliapp-docs.R

@@ -540,7 +540,7 @@ NULL
 #'
 #' The `.file` style now automatically creates a `file:` hyperlink.
 #' Because `file:` hyperlinks must contain an absolute path, cli tries to
-#' convert relative paths, and paths starting with `~` to aboslute path.
+#' convert relative paths, and paths starting with `~` to absolute path.
 #'
 #' ```{asciicast links-file-1}
 #' cli_text("... edit your {.file ~/.Rprofile} file.")

R/diff.R

@@ -185,7 +185,7 @@ get_diff_chunks <- function(lcs, context = 3L) {
 
   # change to include context chunks
   if (context > 0) {
-    # calculae the end before updating the begin
+    # calculate the end before updating the begin
     op_end <- chunks$op_begin + chunks$op_length - 1 + 1
     op_end[op_end > nrow(lcs)] <- nrow(lcs)
     chunks$op_begin <- chunks$op_begin - 1

R/errors.R

@@ -828,7 +828,7 @@ err <- local({
 
   # Error parts:
   # - "Error:" or "Error in " prefix, the latter if the error has a call
-  # - the call, possibly syntax highlightedm possibly trimmed (?)
+  # - the call, possibly syntax highlighted possibly trimmed (?)
   # - source ref, with link to the file, potentially in a new line in cli
   # - error message, just `conditionMessage()`
   # - advice about .Last.error and/or .Last.error.trace

R/hash.R

@@ -568,7 +568,7 @@ hash_file_xxhash <- function(paths) {
 
 #' @export
 #' @rdname hash_xxhash
-#' @details The `64` functions caculate the 64 bit variant
+#' @details The `64` functions calculate the 64 bit variant
 #' of xxHash. Otherwise they work the same.
 
 hash_xxhash64 <- function(x) {

R/inline.R

@@ -74,7 +74,7 @@ inline_collapse <- function(x, style = list()) {
 #'   ```
 #'   The `before` and `after`, etc. style attributes should not be applied
 #'   to `{n}`.
-#' * While making sure that the inlide style's non-interited style is
+#' * While making sure that the inline style's non-inherited style is
 #'   applied to brace expressions. I.e. in
 #'   ```r
 #'   cli_text("{.fun {x}}")

R/utf8.R

@@ -46,7 +46,7 @@ is_utf8_output <- function() {
 #' utf8_nchar(emo, "width")
 #' utf8_nchar(emo, "codepoints")
 #'
-#' # For comparision, the output for width depends on the R version used:
+#' # For comparison, the output for width depends on the R version used:
 #' nchar(emo, "chars")
 #' nchar(emo, "bytes")
 #' nchar(emo, "width")

R/vt.R

@@ -21,15 +21,15 @@
 #' - Unicode graphemes.
 #'
 #' @param output Character vector or raw vector. Character vectors are
-#' collapsed (without a separater), and converted to a raw vector using
+#' collapsed (without a separator), and converted to a raw vector using
 #' [base::charToRaw()].
 #' @param width Terminal width.
 #' @param height Terminal height.
 #' @return Data frame with columns `lineno`, `segmentno`, `segment`,
 #' `attributes`.
 #'
 #' @note
-#' This function is experimental, and the virtual temrinal API will
+#' This function is experimental, and the virtual terminal API will
 #' likely change in future versions of cli.
 #'
 #' @export

R/width.R

@@ -31,7 +31,7 @@
 #' console_width()
 
 console_width <- function() {
-  # cli.width option always takes priotity
+  # cli.width option always takes priority
   cwopt <- getOption("cli.width")
   if (!is.null(cwopt)) {
     if (!is.numeric(cwopt) || length(cwopt) != 1) {