Make sure code is not instrumented multiple times

Closes #15
r-lib · Nov 10, 2017 · bd89f5c · bd89f5c
1 parent a80941d
commit bd89f5c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/R/debug.R b/R/debug.R
@@ -19,7 +19,7 @@ debug <- function(msg, pkg = environmentName(topenv(parent.frame()))) {
     return(msg)
   }
 
-  msg <- sub("^!+DEBUG\\s+", "", msg)
+  msg <- sub("^!+\\s*", "", msg)
   file <- get_output_file()
 
   time_stamp_mode <- if (file == "") "diff" else "stamp"

diff --git a/R/instrument.R b/R/instrument.R
@@ -45,6 +45,7 @@ is_debug_string <- function(x) {
 }
 
 make_debug_call <- function(x) {
+  x <- sub("^(!+)DEBUG", "\\1", x, perl = TRUE)
   x <- handle_dynamic_code(x)
   as.call(list(quote(debugme::debug), x))
 }