Move function calls to right side instead of filtering them out completely

Co-authored-by: m7pr <[email protected]>

Author: Copilot

R/utils-get_code_dependency.R

@@ -301,25 +301,30 @@ extract_occurrence <- function(pd) {
     sym_cond <- rev(sym_cond)
   }
 
-  after <- match(min(x$id[assign_cond]), sort(x$id[c(min(assign_cond), sym_cond)])) - 1
-  
   # Separate symbols before and after assignment
   symbols_before_assign <- sym_cond[x$id[sym_cond] < min(x$id[assign_cond])]
   symbols_after_assign <- sym_cond[x$id[sym_cond] > min(x$id[assign_cond])]
 
-  # Filter out function calls from left side of assignment (before assignment operator)
+  # Move function calls from left side to right side of assignment
   # Function calls should only appear as dependencies (right side), not as assignment targets
+  function_calls_on_left <- c()
   if (length(symbols_before_assign) > 0) {
     is_function_call_before <- x[symbols_before_assign, "token"] == "SYMBOL_FUNCTION_CALL"
+    function_calls_on_left <- symbols_before_assign[is_function_call_before]
     symbols_before_assign <- symbols_before_assign[!is_function_call_before]
   }
 
-  # Combine all symbols (filtered left side + all right side)
-  filtered_sym_cond <- c(symbols_before_assign, symbols_after_assign)
+  # Combine symbols: filtered left side + all right side + moved function calls
+  filtered_sym_cond <- c(symbols_before_assign, symbols_after_assign, function_calls_on_left)
+  
+  # Update the after position based on filtered symbols (only non-function symbols on left)
+  if (length(symbols_before_assign) > 0) {
+    after <- match(min(x$id[assign_cond]), sort(x$id[c(min(assign_cond), symbols_before_assign)])) - 1
+  } else {
+    after <- 0
+  }
 
-  # Update the after position based on filtered symbols
   if (length(filtered_sym_cond) > 0) {
-    after <- match(min(x$id[assign_cond]), sort(x$id[c(min(assign_cond), filtered_sym_cond)])) - 1
     ans <- append(x[filtered_sym_cond, "text"], "<-", after = max(1, after))
   } else {
     ans <- "<-"

tests/testthat/test-fix-function-call-dependencies.R

@@ -23,6 +23,11 @@ testthat::test_that("function calls should not appear on left side of assignment
   # In this case, only 'ADMH' should be on the left side
   testthat::expect_true("ADMH" %in% left_side1,
     info = "Variable 'ADMH' should appear on left side as it's being assigned to")
+  
+  # Function calls should still appear as dependencies on the right side
+  right_side1 <- if(length(assign_pos1) > 0) deps1[seq(assign_pos1[1] + 1, length(deps1))] else character(0)
+  testthat::expect_true("c" %in% right_side1,
+    info = "Function 'c' should appear on right side as a dependency")
 })
 
 testthat::test_that("complex assignment with function calls handles dependencies correctly", {
@@ -48,6 +53,8 @@ testthat::test_that("complex assignment with function calls handles dependencies
   # Functions can be on right side as dependencies
   testthat::expect_true("c" %in% right_side_admh,
     info = "Function 'c' can appear on right side as a dependency")
+  testthat::expect_true("col_labels" %in% right_side_admh,
+    info = "Function 'col_labels' should be moved to right side as a dependency")
 
   # Variables being modified should be on left side
   testthat::expect_true("ADMH" %in% left_side_admh,