fix: improve early stop

Author: averissimo

NEWS.md

@@ -1,5 +1,9 @@
 # teal.code 0.6.1.9000
 
+### Bug fixes
+
+* Fix a problem detecting co-occurences when expression has multiple lines.
+
 # teal.code 0.6.1
 
 ### Bug fixes

R/utils-get_code_dependency.R

@@ -344,11 +344,13 @@ extract_dependency <- function(parsed_code) {
   reordered_full_pd <- extract_calls(full_pd)
 
   # Early return on empty code
-  if (length(parsed_code) == 0L) {
-    return(character(0L))
+  if (length(reordered_full_pd) == 0L) {
+    return(NULL)
   }
 
-  # Check for expressions and process those separetly
+  if (length(parsed_code) == 0L) {
+    return(extract_side_effects(reordered_full_pd[[1]]))
+  }
   expr_ix <- lapply(parsed_code[[1]], class) == "{"
 
   # Build queue of expressions to parse individually
@@ -381,7 +383,8 @@ extract_dependency <- function(parsed_code) {
         # 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
+        # This cleaning is needed as extract_occurrence assumes arrows are fixed, and order is different
+        # than in original pd
         extract_occurrence(reordered_pd[[1]])
       }
     }

tests/testthat/test-utils-get_code_dependency.R

@@ -1,37 +1,3 @@
-testthat::describe("detects multiple assignments in single line", {
-  testthat::it("<-", {
-    # testthat::skip("Not implemented")
-    code <- "var1 <- var2 <- 1"
-    td <- eval_code(qenv(), code)
-
-    testthat::expect_identical(get_code(td, names = "var1"), code)
-    testthat::expect_identical(get_code(td, names = "var2"), code)
-  })
-
-  testthat::it("->", {
-    # testthat::skip("Not implemented")
-    code <- "1 -> var1 -> var2"
-    td <- eval_code(qenv(), code)
-
-    testthat::expect_identical(
-      get_code(td, names = "var1"),
-      as.character(parse(text = code, keep.source = TRUE))
-    )
-
-    testthat::expect_identical(get_code(td, names = "var1"), code)
-    testthat::expect_identical(get_code(td, names = "var2"), code)
-  })
-
-  testthat::it("<- and ->", {
-    # testthat::skip("Not implemented")
-    code <- "var1 <- 1 -> var2"
-    td <- eval_code(qenv(), code)
-
-    testthat::expect_identical(get_code(td, names = "var1"), code)
-    testthat::expect_identical(get_code(td, names = "var2"), code)
-  })
-})
-
 testthat::describe("get_code with single assignments inside an expression", {
   testthat::it("detects assign() function", {
     td <- qenv() |>
@@ -63,7 +29,7 @@ testthat::describe("get_code with single assignments inside an expression", {
     td <- qenv() |>
       within({
         for (i in 1:10) {
-          iris -> var1
+          iris -> var1 # nolint: assignment.
         }
       })
 
@@ -109,8 +75,8 @@ testthat::describe("get_code with multiple assignments inside an expression", {
     td <- qenv() |>
       within({
         for (i in 1:10) {
-          iris -> var1
-          mtcars -> var2
+          iris -> var1  # nolint: assignment.
+          mtcars -> var2  # nolint: assignment.
         }
       })