Merge pull request #1122 from olivroy/error-links

Various code / tests updates

Author: lorenzwalthert

NAMESPACE

@@ -48,6 +48,7 @@ importFrom(purrr,pmap)
 importFrom(purrr,pwalk)
 importFrom(rlang,"%||%")
 importFrom(rlang,abort)
+importFrom(rlang,check_installed)
 importFrom(rlang,is_installed)
 importFrom(rlang,seq2)
 importFrom(rlang,set_names)

R/communicate.R

@@ -39,10 +39,3 @@ communicate_summary <- function(changed, ruler_width) {
     cli::cat_rule(width = max(40L, ruler_width))
   }
 }
-
-
-assert_data.tree_installation <- function() {
-  if (!is_installed("data.tree")) {
-    abort("The package data.tree needs to be installed for this functionality.")
-  }
-}

R/nested-to-tree.R

@@ -47,7 +47,7 @@ create_tree_from_pd_with_default_style_attributes <- function(pd,
 #' }
 #' @keywords internal
 create_node_from_nested_root <- function(pd_nested, structure_only) {
-  assert_data.tree_installation()
+  check_installed("data.tree")
   name <- if (structure_only) {
     "Hierarchical structure"
   } else {

R/parse.R

@@ -158,9 +158,8 @@ ensure_correct_txt <- function(pd, text) {
 
   if (!lines_and_cols_match(new_text)) {
     abort(paste(
-      "Error in styler:::ensure_correct_txt().",
-      "Please file an issue on GitHub (https://github.com/r-lib/styler/issues)"
-    ))
+      "Error in styler:::ensure_correct_txt()."
+    ), .internal = TRUE)
   }
   names_to_keep <- setdiff(
     names(new_text),

R/set-assert-args.R

@@ -9,7 +9,7 @@ set_arg_write_tree <- function(write_tree) {
   if (is.na(write_tree)) {
     write_tree <- is_installed("data.tree")
   } else if (write_tree) {
-    assert_data.tree_installation()
+    check_installed("data.tree")
   }
   write_tree
 }

R/styler-package.R

@@ -23,10 +23,8 @@
 #' @importFrom magrittr "%>%"
 #' @importFrom purrr compact partial flatten flatten_int flatten_chr
 #' @importFrom purrr map map_lgl map_int map_chr map2 map2_chr map_at pmap pwalk
-#' @importFrom rlang abort warn seq2 is_installed "%||%" set_names
-#' @importFrom vctrs vec_rbind
-#' @importFrom vctrs vec_slice
-#' @importFrom vctrs vec_split
+#' @importFrom rlang abort warn seq2 check_installed is_installed "%||%" set_names
+#' @importFrom vctrs vec_rbind vec_slice vec_split
 ## usethis namespace: end
 NULL
 

R/testing.R

@@ -379,5 +379,5 @@ skip_during_parallel <- function() {
   Sys.getenv("STYLER_TEST_IS_TRULY_PARALLEL", TRUE) %>%
     toupper() %>%
     as.logical() %>%
-    testthat::skip_if()
+    testthat::skip_if("Running in parallel")
 }

R/transform-code.R

@@ -22,7 +22,7 @@ transform_code <- function(path, fun, ..., dry) {
       ..., dry = dry
     )
   } else {
-    abort(paste(path, "is not an R, Rmd or Rnw file"))
+    abort(paste(path, "is not an R, Rmd, qmd, or Rnw file"))
   }
 }
 

R/transform-files.R

@@ -418,19 +418,16 @@ verify_roundtrip <- function(old_text, new_text, parsable_only = FALSE) {
       error = function(e) {
         rlang::abort(paste0(
           "Styling resulted in code that isn't parsable. This should not ",
-          "happen. Please file a bug report on GitHub ",
-          "(https://github.com/r-lib/styler/issues) using a reprex."
-        ))
+          "happen."
+        ), .internal = TRUE)
       }
     )
   } else if (!expressions_are_identical(old_text, new_text)) {
     msg <- paste(
       "The expression evaluated before the styling is not the same as the",
-      "expression after styling. This should not happen. Please file a",
-      "bug report on GitHub (https://github.com/r-lib/styler/issues)",
-      "using a reprex."
+      "expression after styling. This should not happen."
     )
-    abort(msg)
+    abort(msg, .internal = TRUE)
   }
 }
 

R/vertical.R

@@ -25,7 +25,7 @@ print.vertical <- function(x, ...,
       x <- prettycode::highlight(x, style = style)
     } else {
       warn(paste(
-        "Could not use colored = TRUE, as the package prettycode is not",
+        "Could not use `colored = TRUE`, as the package prettycode is not",
         "installed. Please install it if you want to see colored output",
         "or see `?print.vertical` for more information."
       ))