From a85849d20298e8524cdca77c26d4f3a56e48d786 Mon Sep 17 00:00:00 2001
From: Jenny Bryan <jenny.f.bryan@gmail.com>
Date: Tue, 11 Sep 2018 14:08:11 -0700
Subject: [PATCH] Refactor utilities around 'md --> R' and un-reprexing

---
 DESCRIPTION     |  2 +-
 R/reprex-undo.R | 76 ++++++++++++++++++++++++++++++-------------------
 R/reprex.R      | 10 ++-----
 3 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 961bfe0f..8e32920d 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -52,5 +52,5 @@ VignetteBuilder: knitr
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 6.0.1.9000
+RoxygenNote: 6.1.0
 SystemRequirements: pandoc (>= 1.12.3) - http://pandoc.org
diff --git a/R/reprex-undo.R b/R/reprex-undo.R
index a1b61b5c..23833f22 100644
--- a/R/reprex-undo.R
+++ b/R/reprex-undo.R
@@ -165,15 +165,11 @@ reprex_undo <- function(input = NULL,
     }
   }
 
-  if (is_md) {
-    if (venue == "gh") { ## reprex_invert
-      line_info <- classify_lines_bt(src, comment = comment)
-    } else {
-      line_info <- classify_lines(src, comment = comment)
-    }
-    x_out <- ifelse(line_info == "prose" & nzchar(src), prose(src), src)
-    x_out <- x_out[!line_info %in% c("output", "bt", "so_header") & nzchar(src)]
-    x_out <- sub("^    ", "", x_out)
+  if (is_md) { ## reprex_invert
+    flavor <- if (venue == "gh") "fenced" else "indented"
+    x_out <- convert_md_to_r(
+      src, comment = comment, flavor = flavor, drop_output = TRUE
+    )
   } else if (is.null(prompt)) { ## reprex_clean
     x_out <- src[!grepl(comment, src)]
   } else { ## reprex_rescue
@@ -193,36 +189,56 @@ reprex_undo <- function(input = NULL,
   invisible(x_out)
 }
 
-## classify_lines_bt()
-## x = presumably output of reprex(..., venue = "gh"), i.e. Github-flavored
-## markdown in a character vector, with backtick code blocks
-## returns character vector
-## calls each line of x like so:
-##   * bt = backticks
-##   * code = inside a backtick code block
-##   * output = output inside backtick code block (line matches `comment` regex)
-##   * prose = not inside a backtick code block
-classify_lines_bt <- function(x, comment = "^#>") {
+convert_md_to_r <- function(lines,
+                            comment = "#>",
+                            flavor = c("fenced", "indented"),
+                            drop_output = FALSE) {
+  flavor <- match.arg(flavor)
+  classify_fun <- switch(flavor,
+                         fenced = classify_fenced_lines,
+                         indented = classify_indented_lines)
+  lines_info <- classify_fun(lines, comment = comment)
+
+  lines_out <- ifelse(lines_info == "prose" & nzchar(lines), prose(lines), lines)
+
+  drop_classes <- c("bt", "so_header", if (drop_output) "output")
+  lines_out <- lines_out[nzchar(lines_out) & !lines_info %in% drop_classes]
+
+  if (flavor == "indented") {
+    lines_out <- sub("^    ", "", lines_out)
+  }
+
+  lines_out
+}
+
+## Classify lines in the presence of fenced code blocks.
+## Specifically, blocks fenced by three backticks.
+## This is true of the output from reprex(..., venue = "gh").
+## Classifies each line like so:
+##   * bt     = backticks
+##   * code   = code inside a fenced block
+##   * output = commented output inside a fenced block
+##   * prose  = outside a fenced block
+classify_fenced_lines <- function(x, comment = "^#>") {
   x_shift <- c("", utils::head(x, -1))
-  cum_bt <- cumsum(grepl("^```", x_shift))
+  cumulative_fences <- cumsum(grepl("^```", x_shift))
   wut <- ifelse(grepl("^```", x), "bt",
-    ifelse(cum_bt %% 2 == 1, "code", "prose")
+    ifelse(cumulative_fences %% 2 == 1, "code", "prose")
   )
   wut <- ifelse(wut == "code" & grepl(comment, x), "output", wut)
   wut
 }
 
-## classify_lines()
-## x = presumably output of reprex(..., venue = "so"), i.e. NOT Github-flavored
-## markdown in a character vector, with code blocks indented with 4 spaces
+## Classify lines in the presence of indented code blocks.
+## Specifically, blocks indented with 4 spaces.
+## This is true of the output from reprex(..., venue = "so").
 ## https://stackoverflow.com/editing-help
-## returns character vector
-## calls each line of x like so:
-##   * code = inside a code block indented by 4 spaces
-##   * output = output inside an indented code block (line matches `comment` regex)
-##   * prose = not inside a code block
+## Classifies each line like so:
+##   * code      = code inside an indented code block
+##   * output    = commented output inside an indented code block
+##   * prose     = outside an indented code block
 ##   * so_header = special html comment for so syntax highlighting
-classify_lines <- function(x, comment = "^#>") {
+classify_indented_lines <- function(x, comment = "^#>") {
   comment <- sub("\\^", "^    ", comment)
   wut <- ifelse(grepl("^    ", x), "code", "prose")
   wut <- ifelse(wut == "code" & grepl(comment, x), "output", wut)
diff --git a/R/reprex.R b/R/reprex.R
index 546d66c3..3940df1f 100644
--- a/R/reprex.R
+++ b/R/reprex.R
@@ -323,7 +323,9 @@ reprex <- function(x = NULL,
   if (venue %in% c("r", "rtf")) {
     rout_file <- files[["rout_file"]]
     output_lines <- readLines(md_file, encoding = "UTF-8")
-    output_lines <- convert_md_to_r(output_lines, comment = comment)
+    output_lines <- convert_md_to_r(
+      output_lines, comment = comment, flavor = "fenced"
+    )
     writeLines(output_lines, rout_file)
     if (outfile_given) {
       message("Writing reprex as commented R script:\n  * ", rout_file)
@@ -392,12 +394,6 @@ reprex_render <- function(input, std_out_err = NULL) {
   )
 }
 
-convert_md_to_r <- function(lines, comment = "#>") {
-  line_info <- classify_lines_bt(lines, comment = comment)
-  lines <- ifelse(line_info == "prose" & nzchar(lines), prose(lines), lines)
-  lines[line_info != "bt"]
-}
-
 reprex_highlight <- function(rout_file, reprex_file, arg_string = NULL) {
   arg_string <- arg_string %||% highlight_args()
   cmd <- paste0(