Merge pull request #832 from lorenzwalthert/issue-831

- Allow non-parsable code in headers (#831).

Author: lorenzwalthert

NEWS.md

@@ -1,13 +1,16 @@
 
 # styler 1.5.1.9000 (Development version)
 
-* Files with `.Rmarkdown` extension are now recognized as an R markdown files in `style_file()` and friends (#824).
+* Files with `.Rmarkdown` extension are now recognized as an R markdown files in
+  `style_file()` and friends (#824).
 
 * Don't break line before comments in pipes (#822).
 
 * Ordinary comments (starting with `#`) within a roxygen code example block 
   (starting with `#'`) are now recognized and preserved (#830).
 
+* R Markdown chunk headers are no longer required to be parsable R code (#832).
+
 * Break the line between `%>%` and `{` inside and outside function calls (#825).
 
 # styler 1.5.1

R/transform-code.R

@@ -117,12 +117,14 @@ identify_raw_chunks <- function(lines, filetype, engine_pattern = get_engine_pat
 #' @keywords internal
 finalize_raw_chunks <- function(start, end, filetype, lines) {
   header <- gsub(get_knitr_pattern(filetype)$chunk.begin, "\\2", lines[start])
-  parsed <- get_parse_data(paste0("c(", header, ")"))$text
-  do_not_tidy <- any(parsed == "tidy") &&
-    parsed[which(parsed == "tidy") + 1] == "=" &&
-    parsed[which(parsed == "tidy") + 2] == "FALSE"
-  if (do_not_tidy) {
-    return(NULL)
+  # matches last , tidy = TRUE, ignoring quotes!
+  extracted_false <- gsub(
+    ".*,\\s*\\t*tidy\\s*\\t*=\\s*\\t*(F|FALSE)(\\s+.*|\\t+.*|,+.*|)$",
+    "\\1",
+    header
+  )
+  if (extracted_false %in% c("F", "FALSE")) {
+    NULL
   } else {
     list(starts = start, ends = end)
   }

tests/testthat/rmd/no-tidy-in.Rmd

@@ -16,3 +16,49 @@ test + f(1)
 ```{r}
 test + f(1)
 ```
+
+```{r, A = ', tidy = FALSE,'}
+knitr::opts_chunk$set(echo = TRUE ) 
+```
+
+```{r, A = ', tidy = FALSE}'}
+knitr::opts_chunk$set(echo = TRUE ) 
+```
+
+```{r, A = ', tidy = FALSE'}
+knitr::opts_chunk$set(echo = TRUE ) 
+```
+
+```{r, A = 'tidy = FALSE, and more'}
+knitr::opts_chunk$set(echo = TRUE ) 
+```
+
+
+```{r, tidy = TRUE}
+knitr::opts_chunk$set(echo = TRUE )
+```
+
+```{r, a = ',tidy = FALSE'}
+knitr::opts_chunk$set(echo = TRUE )
+```
+
+```{r, a = ',tidy = TRUE'}
+knitr::opts_chunk$set(echo = TRUE )
+```
+
+
+```{r, tidy = FALSE, aniopts= 3}
+knitr::opts_chunk$set(echo = TRUE )
+```
+
+```{r, tidy= FALSE, aniopts= 3}
+knitr::opts_chunk$set(echo = TRUE )
+```
+
+```{r, tidy =FALSE, aniopts= 3}
+knitr::opts_chunk$set(echo = TRUE )
+```
+
+```{r, aniopts= 3, tidy = FALSE}
+knitr::opts_chunk$set(echo = TRUE )
+```

tests/testthat/rmd/no-tidy-out.Rmd

@@ -16,3 +16,49 @@ test + f(1)
 ```{r}
 test + f(1)
 ```
+
+```{r, A = ', tidy = FALSE,'}
+knitr::opts_chunk$set(echo = TRUE ) 
+```
+
+```{r, A = ', tidy = FALSE}'}
+knitr::opts_chunk$set(echo = TRUE)
+```
+
+```{r, A = ', tidy = FALSE'}
+knitr::opts_chunk$set(echo = TRUE)
+```
+
+```{r, A = 'tidy = FALSE, and more'}
+knitr::opts_chunk$set(echo = TRUE)
+```
+
+
+```{r, tidy = TRUE}
+knitr::opts_chunk$set(echo = TRUE)
+```
+
+```{r, a = ',tidy = FALSE'}
+knitr::opts_chunk$set(echo = TRUE)
+```
+
+```{r, a = ',tidy = TRUE'}
+knitr::opts_chunk$set(echo = TRUE)
+```
+
+
+```{r, tidy = FALSE, aniopts= 3}
+knitr::opts_chunk$set(echo = TRUE )
+```
+
+```{r, tidy= FALSE, aniopts= 3}
+knitr::opts_chunk$set(echo = TRUE )
+```
+
+```{r, tidy =FALSE, aniopts= 3}
+knitr::opts_chunk$set(echo = TRUE )
+```
+
+```{r, aniopts= 3, tidy = FALSE}
+knitr::opts_chunk$set(echo = TRUE )
+```