treat empty calls or comments as separate calls

Author: m7pr

R/qenv-eval_code.R

@@ -31,6 +31,10 @@ setMethod("eval_code", signature = c("qenv", "character"), function(object, code
   parsed_code <- parse(text = code, keep.source = TRUE)
   object@env <- rlang::env_clone(object@env, parent = parent.env(.GlobalEnv))
   if (length(parsed_code) == 0) {
+    # empty code, or just comments
+    attr(code, "id") <- sample.int(.Machine$integer.max, size = 1)
+    attr(code, "dependency") <- extract_dependency(parsed_code) # in case comment contains @linksto tag
+    object@code <- c(object@code, list(code))
     return(object)
   }
   code_split <- split_code(paste(code, collapse = "\n"))

R/utils-get_code_dependency.R

@@ -315,20 +315,22 @@ extract_occurrence <- function(pd) {
 #' @noRd
 extract_side_effects <- function(pd) {
   linksto <- grep("@linksto", pd[pd$token == "COMMENT", "text"], value = TRUE)
-  unlist(strsplit(sub("\\s*#\\s*@linksto\\s+", "", linksto), "\\s+"))
+  unlist(strsplit(sub("\\s*#.*@linksto\\s+", "", linksto), "\\s+"))
 }
 
 #' @param parsed_code results of `parse(text = code, keep.source = TRUE` (parsed text)
 #' @keywords internal
 #' @noRd
 extract_dependency <- function(parsed_code) {
   pd <- normalize_pd(utils::getParseData(parsed_code))
-  reordered_pd <- extract_calls(pd)[[1]]
-  # extract_calls is needed to reorder the pd so that assignment operator comes before symbol names
-  # extract_calls is needed also to substitute assignment operators into specific format with fix_arrows
-  # extract_calls is needed to omit empty calls that contain only one token `"';'"`
-  # This cleaning is needed as extract_occurrence assumes arrows are fixed, and order is different than in original pd.
-  c(extract_side_effects(reordered_pd), extract_occurrence(reordered_pd))
+  reordered_pd <- extract_calls(pd)
+  if (length(reordered_pd) > 0) {
+    # extract_calls is needed to reorder the pd so that assignment operator comes before symbol names
+    # extract_calls is needed also to substitute assignment operators into specific format with fix_arrows
+    # extract_calls is needed to omit empty calls that contain only one token `"';'"`
+    # This cleaning is needed as extract_occurrence assumes arrows are fixed, and order is different than in original pd.
+    c(extract_side_effects(reordered_pd[[1]]), extract_occurrence(reordered_pd[[1]]))
+  }
 }
 
 # graph_parser ----

tests/testthat/test-qenv_eval_code.R

@@ -258,11 +258,28 @@ testthat::test_that("comments from the same line are associated with it's call",
   )
 })
 
-testthat::test_that("comments alone passed to eval_code are skipped", {
+testthat::test_that("comments passed alone to eval_code are separate calls", {
   code <- c("x <- 5", "# comment")
   q <- eval_code(eval_code(qenv(), code[1]), code[2])
   testthat::expect_identical(
     get_code(q),
-    code[1]
+    pasten(code)
+  )
+})
+
+testthat::test_that("comments passed alone to eval_code that contain @linksto tag have detected dependency", {
+  code <- c("x <- 5", "# comment @linksto x")
+  q <- eval_code(eval_code(qenv(), code[1]), code[2])
+  testthat::expect_identical(
+    get_code(q),
+    pasten(code)
+  )
+  testthat::expect_identical(
+    get_code(q, names = 'x'),
+    pasten(code)
+  )
+  testthat::expect_identical(
+    attr(q@code[[2]], "dependency"),
+    "x"
   )
 })