Allow evaluation of field_expression if it's not under a call_expression

Olical · Nov 16, 2024 · 3aa8ffc · 3aa8ffc
1 parent 1c49572
commit 3aa8ffc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/dev/julia/sandbox.jl b/dev/julia/sandbox.jl
@@ -1,5 +1,6 @@
 using Pkg
 Pkg.activate("project")
+Pkg.activate
 
 1 + 1
 

diff --git a/fnl/conjure/client/julia/stdio.fnl b/fnl/conjure/client/julia/stdio.fnl
@@ -31,8 +31,15 @@
 (local comment-prefix "# ")
 
 (fn form-node? [node]
-  (and (not= "field_expression" (node:type))
-       (not= "argument_list" (node:type))))
+  (let [parent (node:parent)]
+    (and
+      ;; Pkg.activate(...) should execute the expression Pkg.foo should just return foo.
+      (not (and
+             (= "call_expression" (parent:type))
+             (= "field_expression" (node:type))))
+
+      ;; Don't eval arg lists as tuples, just evaluate the call_expression above.
+      (not= "argument_list" (node:type)))))
 
 (fn with-repl-or-warn [f _opts]
   (let [repl (state :repl)]

diff --git a/lua/conjure/client/julia/stdio.lua b/lua/conjure/client/julia/stdio.lua