+3.5% is too much, let's not check newlines

r-lib · Apr 10, 2021 · 35c50e1 · 35c50e1
1 parent f871e49
commit 35c50e1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 36 deletions.
diff --git a/R/expr-is.R b/R/expr-is.R
@@ -127,22 +127,13 @@ is_shebang <- function(pd) {
 #'   "# title",
 #'   "some_code <- function() {}",
 #'   "#+ chunk-label, opt1=value1",
-#'   "call(3, 2, c(3:2))"
+#'   "call(3, 2, c(3:2))",
+#'   "#> 99"
 #' ))
 #' @param pd A parse table.
 #' @keywords internal
-is_code_chunk_header_or_xaringan <- function(pd) {
-  grepl("^#[\\+|\\-|<<]", pd$text, perl = TRUE)
-}
-
-#' Identify output comments
-#'
-#' Determines if parse table contains `#>` at the beginning of a line, which is
-#' often used to prefix the output value of previous R code.
-#' @param pd A parse table.
-#' @keywords internal
-is_output_prefix <- function(pd) {
-  grepl("^#>", pd$text) & pd$lag_newlines > 0L
+is_code_chunk_header_or_xaringan_or_code_output <- function(pd) {
+  grepl("^#[\\+|\\-|<<|>]", pd$text, perl = TRUE)
 }
 
 contains_else_expr <- function(pd) {

diff --git a/R/rules-spaces.R b/R/rules-spaces.R
@@ -252,8 +252,7 @@ start_comments_with_space <- function(pd, force_one = FALSE) {
   if (any(is_comment)) {
     is_comment <- is_comment &
       !is_shebang(pd) &
-      !is_code_chunk_header_or_xaringan(pd) &
-      !is_output_prefix(pd)
+      !is_code_chunk_header_or_xaringan_or_code_output(pd)
     if (!any(is_comment)) {
       return(pd)
     }

diff --git a/man/is_code_chunk_header_or_xaringan.Rd → ...hunk_header_or_xaringan_or_code_output.Rd b/man/is_code_chunk_header_or_xaringan.Rd → ...hunk_header_or_xaringan_or_code_output.Rd
diff --git a/man/is_output_prefix.Rd b/man/is_output_prefix.Rd
diff --git a/tests/testthat/parse_comments/output-prefix-out.R b/tests/testthat/parse_comments/output-prefix-out.R
@@ -2,7 +2,7 @@ this()
 #> is output
 
 
-this() # > is not
+this() #> is not
 
 this()
 # > not sure