Merge pull request #386 from lorenzwalthert/rmd

Accept engine-agnostic code in .Rmd
r-lib · Apr 3, 2018 · ea6dcd6 · ea6dcd6
2 parents a1fe62f + 5b376f4
commit ea6dcd6
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 4 deletions.
diff --git a/R/transform-code.R b/R/transform-code.R
@@ -73,8 +73,9 @@ identify_r_raw_chunks <- function(lines, engine_pattern = get_engine_pattern())
   if (is.null(pattern$chunk.begin) || is.null(pattern$chunk.end)) {
     stop("Unrecognized chunk pattern!", call. = FALSE)
   }
-  starts <- grep("^[\t >]*```+\\s*\\{\\s*([a-zA-Z0-9]+.*)\\}\\s*$", lines, perl = TRUE)
-  ends <- grep("^[\t >]*```+\\s*$", lines, perl = TRUE)
+  chunks <- grep("^[\t >]*```+\\s*", lines, perl = TRUE)
+  starts <- odd(chunks)
+  ends <- even(chunks)
 
   if (length(starts) != length(ends)) {
     stop("Malformed file!", call. = FALSE)

diff --git a/R/utils.R b/R/utils.R
@@ -1,5 +1,25 @@
 parse_text <- function(x) parse(text = x)[[1L]]
 
+line_col_names <- function() {
+  c("line1", "line2", "col1", "col2")
+}
+
+#' Check whether two columns match
+#'
+#' @param col1,col2 Column names as string.
+#' @param data The data frames that contains `col1` and `col2`.
+two_cols_match <- function(col1, col2, data) {
+  all(unlist(data[col1]) == unlist(data[col2]))
+}
+
+odd <- function(x) {
+  x[seq(1L, length(x), by = 2)]
+}
+
+even <- function(x) {
+  x[seq(2L, length(x), by = 2)]
+}
+
 #' Repeat elements of a character vector `times` times and collapse it
 #'
 #' @param char A character vector.

diff --git a/tests/testthat/rmd/r_and_non_r_code_chunks-in.Rmd b/tests/testthat/rmd/r_and_non_r_code_chunks-in.Rmd
@@ -28,3 +28,8 @@ I like the jungle, I like the .2'
 I like the jungle,
 ```
 
+
+Code without engine
+```
+1+1
+```
diff --git a/tests/testthat/rmd/r_and_non_r_code_chunks-out.Rmd b/tests/testthat/rmd/r_and_non_r_code_chunks-out.Rmd
@@ -28,3 +28,8 @@ I like the jungle, I like the .2'
 I like the jungle,
 ```
 
+
+Code without engine
+```
+1+1
+```
diff --git a/tests/testthat/test-rmd.R b/tests/testthat/test-rmd.R
@@ -1,13 +1,13 @@
 context("rmd")
 
 test_that("can style .Rmd files", {
-  expect_error(test_collection(
+  expect_warning(test_collection(
     "rmd", "simple",
     transformer = transform_rmd,
     transformer_fun = style_text,
     write_tree = FALSE
   ), NA)
-  expect_error(test_collection(
+  expect_warning(test_collection(
     "rmd", "r_and_non_r_code_chunks",
     transformer = transform_rmd,
     transformer_fun = style_text,