Merge 04206b4 into 1edbe47

R/helpers.R

@@ -11,9 +11,20 @@ get_design_code <- function(design){
 construct_design_code <- function(designer, args){
   # get the code for the design 
   txt <- as.character(getSrcref(designer))
-
-  open <- grep("[{]{3}", txt)
-  close <- grep("[}]{3}", txt)
+  if(length(txt)==0){
+    txt <- deparse(designer)
+    x <- grep("^[[:blank:]]*[{]", txt)
+    open <- x[which(diff(x) == 1)]
+    if(length(open)>3) stop("More than three consecutive `{` found in ", substitute(designer))
+    open <- max(open)+1
+    x <- grep("^[[:blank:]]*[}]", txt)
+    close <- x[which(diff(x) == 1)]
+    if(length(close)>2) stop("More than three consecutive `}` found in ", substitute(designer))
+    close <- min(close)
+  }else{
+    open <- grep("[{]{3}", txt)
+    close <- grep("[}]{3}", txt)
+  }
 
   if(length(open) != 1) stop("could not find opening tag in ", substitute(designer))
   if(length(close) != 1) stop("could not find opening tag in ", substitute(designer))

tests/testthat/test_designers.R

@@ -44,6 +44,12 @@ for(designer in designers){
       expect_true(any(grepl("declare_design|/",design_attr$code)))
     })
 
+  testthat::test_that(
+    desc = paste0(designer, "'s default design code runs without errors"),
+    code = {
+      expect_error(eval(parse(text = get_design_code(one_design))), NA)
+    })
+
   testthat::test_that(
     desc = paste0("Code inside ",designer, " runs and creates an appropriately named design object."),
     code = {