Merge branch 'master' into no_reindention_calls

Author: lorenzwalthert

DESCRIPTION

@@ -7,9 +7,7 @@ Description:
     Pretty-prints R code without changing the user's formatting intent.
 Imports:
     dplyr,
-    magrittr,
     purrr,
-    readr,
     rlang,
     rprojroot,
     tibble,

R/nested_to_tree.R

@@ -17,11 +17,10 @@ create_tree <- function(text) {
 #' @param pd_nested A nested tibble.
 #' @return An object of class "Node" and "R6".
 #' @examples
-#' library("magrittr")
 #' code <- "a <- function(x) { if(x > 1) { 1+1 } else {x} }"
-#' l1 <- styler:::compute_parse_data_nested(code) %>%
-#'   styler:::pre_visit(c(styler:::create_filler)) %>%
-#'   styler:::create_node_from_nested_root()
+#' nested_pd <- styler:::compute_parse_data_nested(code)
+#' initialized <- styler:::pre_visit(nested_pd, c(styler:::create_filler))
+#' styler:::create_node_from_nested_root(initialized)
 create_node_from_nested_root <- function(pd_nested) {
   n <- data.tree::Node$new("ROOT (token: short_text [lag_newlines/spaces] {id})")
   create_node_from_nested(pd_nested, n)

R/styler.R

@@ -4,4 +4,14 @@
 #'  according to a style guide. See the INDEX for more information.
 #'
 "_PACKAGE"
-if (getRversion() >= "2.15.1") utils::globalVariables(c("."))
+if (getRversion() >= "2.15.1") {
+  utils::globalVariables(c(
+    ".",
+    "pd", "pd_nested", "pd_flat", "flattened_pd",
+    "line1", "line2", "col1", "col2",
+    "terminal", "text", "short",
+    "spaces", "lag_spaces",
+    "newlines", "lag_newlines",
+    NULL
+  ))
+}

R/transform.R

@@ -10,9 +10,8 @@
 #'   carefully inspect the changes via a message sent to the console.
 transform_files <- function(files, transformers) {
   transformer <- make_transformer(transformers)
-
   changed <- utf8::transform_lines_enc(files, transformer)
-  if (any(changed)) {
+  if (any(changed, na.rm = TRUE)) {
     message("Please review the changes carefully!")
   }
   invisible(changed)

R/ws.R

@@ -26,9 +26,16 @@ style_pkg <- function(pkg = ".",
 }
 
 prettify_local <- function(transformers) {
-  r_files <- dir(path = "R", pattern = "[.][rR]$", recursive = TRUE, full.names = TRUE)
+  r_files <- dir(
+    path = "R", pattern = "[.][rR]$", recursive = TRUE, full.names = TRUE
+  )
+
   r_files <- grep("/RcppExports[.]R$", r_files, invert = TRUE, value = TRUE)
-  test_files <- dir(path = "tests/testthat", pattern = "[.][rR]$", recursive = TRUE, full.names = TRUE)
+  test_files <- dir(
+    path = "tests/testthat", pattern = "[.][rR]$",
+    recursive = TRUE, full.names = TRUE
+  )
+
   files <- c(r_files, test_files)
 
   transform_files(files, transformers)
@@ -46,6 +53,7 @@ style_text <- function(text,
                        ...,
                        style = tidyverse_style,
                        transformers = style(...)) {
+
   transformer <- make_transformer(transformers)
   transformer(text)
 }
@@ -65,7 +73,9 @@ style_dir <- function(path = ".",
                       style = tidyverse_style,
                       transformers = style(...),
                       recursive = TRUE) {
-  withr::with_dir(path, prettify_any(transformers, recursive = recursive))
+  withr::with_dir(
+    path, prettify_any(transformers, recursive = recursive)
+  )
 }
 
 #' Prettify R code in current working directory
@@ -92,8 +102,10 @@ style_file <- function(path,
                        ...,
                        style = tidyverse_style,
                        transformers = style(...)) {
-  withr::with_dir(dirname(path),
-                 prettify_one(transformers, basename(path)))
+  withr::with_dir(
+    dirname(path),
+    prettify_one(transformers, basename(path))
+  )
 }
 
 #' Prettify one R file

man/create_node_from_nested_root.Rd

@@ -0,0 +1,3 @@
+b <- call() {
+  d
+}

tests/testthat/exception_handling/parser-error.R

@@ -0,0 +1,14 @@
+context("Exception handling")
+
+test_that("style_text returns custom error", {
+  expect_error(style_text("a <- 3 4"), "unexpected numeric constant")
+})
+
+
+base <- rprojroot::find_testthat_root_file("exception_handling")
+test_that("style_file returns custom error", {
+  expect_warning(
+    style_file(paste0(base, "/parser-error.R")),
+    "When processing"
+  )
+})