handle code included in curly brackets

R/utils-get_code_dependency.R

@@ -33,6 +33,13 @@ get_code_dependency <- function(code, names, check_names = TRUE) {
     return(code)
   }
 
+  # If code is bound in curly brackets, remove them.
+  tcode <- trimws(code)
+  if (grepl("^\\{", tcode) & grepl("\\}$", tcode)) {
+    code <- gsub("^\\{", "", gsub("\\}$", "", tcode))
+  }
+
+
   code <- parse(text = code, keep.source = TRUE)
   pd <- utils::getParseData(code)
   calls_pd <- extract_calls(pd)

tests/testthat/test-get_code.R

@@ -24,6 +24,16 @@ testthat::test_that("handles the code without symbols on rhs", {
   )
 })
 
+testthat::test_that("handles the code included in curly brackets", {
+  code <- "{1 + 1;a <- 5}"
+
+  testthat::expect_identical(
+    get_code(teal_data(a = 5, code = code), datanames = "a"),
+    paste(warning_message, "a <- 5", sep = "\n")
+  )
+})
+
+
 testthat::test_that("extracts the code of a binding from character vector containing simple code", {
   code <- c(
     "a <- 1",
@@ -421,6 +431,24 @@ testthat::test_that("ignores occurrence in a function definition that has functi
   )
 })
 
+testthat::test_that("ignores occurrence in a function definition if there is multiple function definitions", {
+  code <- c(
+    "b <- 2",
+    "foo <- function(b) { function(c) {b <- c + 2 }}",
+    "b <- b + 1",
+    "bar <- function(b) print(b)"
+  )
+  tdata <- eval_code(teal_data(), code)
+  testthat::expect_identical(
+    get_code(tdata, datanames = "b"),
+    "b <- 2"
+  )
+  testthat::expect_identical(
+    get_code(tdata, datanames = "foo"),
+    "foo <- function(b) {\n    function(c) {\n        b <- c + 2\n    }\n}"
+  )
+})
+
 testthat::test_that("ignores occurrence in a function definition in lapply", {
   code <- c(
     "a <- list(a = 1, b = 2, c = 3)",