Merge pull request #885 from lorenzwalthert/issue-884

Better handling of emtpy string input

Author: lorenzwalthert

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ default_stages: [commit]
 
 repos:
 -   repo: https://github.com/lorenzwalthert/precommit
-    rev: v0.1.3.9139
+    rev: v0.2.2.9006
     hooks:
     -   id: style-files
         args: [--style_pkg=styler, --style_fun=tidyverse_style]
@@ -52,7 +52,8 @@ repos:
         exclude: >
           (?x)^(
           tests/testthat/public-api/xyzaddin/addin_region-.*|
-          tests/testmanual/addins/r-invalid\.R|
+          tests/.*invalid.*|
+          tests/testthat/rmd/no-tidy-out\.Rmd|
           tests/testthat/escaping/basic-escape-out\.R|
           tests/testthat/indention_operators/.*pipe.*|
           tests/testthat/line_breaks_and_other/.*pipe.*|
@@ -78,7 +79,7 @@ repos:
           tests/testthat/.*\.R(md)?
           )$
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.1.0
     hooks:
     -   id: check-added-large-files
         args: ['--maxkb=200']

NEWS.md

@@ -32,16 +32,18 @@
 
 * Piped function without brackets `substitute(x %>% y)` don't get `()` added
   anymore, as this can change outcome of the code (#876).
+* Add vignette on distributing style guide (#846, #861).
 * Alignment detection respects stylerignore (#850).
+* `Warning: Unknown or uninitialised column:` was fixed (#885).
 * Unaligned expressions with quoted key (e.g. `c("x" = 2)`) are now correctly
   detected (#881).
-* Add vignette on distributing style guide (#846, #861).
 * ensure a trailing blank line also if the input is cached (#867).
 * Preserve trailing blank line in roxygen examples to simplify concatenation of examples (#880).
 * Fix argument name `filetype` in Example for `style_dir()` (#855).
 * An error is now thrown on styling if input unicode characters can't be 
   correctly parsed for Windows and R < 4.2 (#883).
 
+
 **Infrastructure**
 
 * Remove dependency on {xfun} (#866).

R/roxygen-examples.R

@@ -70,6 +70,8 @@ style_roxygen_code_example_segment <- function(one_dont,
                                                base_indention) {
   if (length(one_dont) < 1L) {
     return(character())
+  } else if (identical(one_dont, "\n")) {
+    return(character(1L))
   }
   dont_seqs <- find_dont_seqs(one_dont)
   split_segments <- split_roxygen_segments(one_dont, unlist(dont_seqs))

R/transform-files.R

@@ -270,13 +270,17 @@ parse_transform_serialize_r <- function(text,
 #' @keywords internal
 #' @seealso specify_transformers_drop
 transformers_drop <- function(text, transformers) {
-  is_colon <- text == ";"
-  if (any(is_colon)) {
-    # ; can only be parsed when on the same line as other token, not the case
-    # here since text is output of compute_parse_data_nested.
-    text <- c(text[!is_colon], "1;")
+  if (length(text) > 0) {
+    is_colon <- text == ";"
+    if (any(is_colon)) {
+      # ; can only be parsed when on the same line as other token, not the case
+      # here since text is output of compute_parse_data_nested.
+      text <- c(text[!is_colon], "1;")
+    }
+    token <- unique(tokenize(text)$token)
+  } else {
+    token <- character()
   }
-  token <- unique(tokenize(text)$token)
   for (scope in c("line_break", "space", "token", "indention")) {
     rules <- transformers$transformers_drop[[scope]]
     for (rule in names(rules)) {

tests/testthat/public-api/xyzfile_rmd/random4.Rmd renamed to tests/testthat/public-api/xyzfile_rmd/invalid4.Rmd

@@ -165,12 +165,12 @@ test_that("styler can style Rmarkdown file", {
 
 test_that("styler handles malformed Rmd file and invalid R code in chunk", {
   capture_output(expect_warning(
-    style_file(testthat_file("public-api", "xyzfile_rmd", "random4.Rmd"), strict = FALSE),
+    style_file(testthat_file("public-api", "xyzfile_rmd", "invalid4.Rmd"), strict = FALSE),
     "3: "
   ))
 
   capture_output(expect_warning(
-    style_file(testthat_file("public-api", "xyzfile_rmd", "random7.Rmd"), strict = FALSE),
+    style_file(testthat_file("public-api", "xyzfile_rmd", "invalid7.Rmd"), strict = FALSE),
     "Malformed file"
   ))
 })

tests/testthat/public-api/xyzfile_rmd/random7.Rmd renamed to tests/testthat/public-api/xyzfile_rmd/invalid7.Rmd

@@ -22,7 +22,7 @@ test_that("can style .Rmd files", {
     write_tree = FALSE
   ), NA)
 
-  expect_warning(test_collection("rmd", "no-tidy",
+  expect_warning(test_collection("rmd", "invalid",
     transformer = transform_mixed,
     transformer_fun = style_text,
     filetype = "Rmd",