Skip to content

Commit 889d1fe

Browse files
authored
Merge pull request #753 from pyrmont/bugfix.eval-file-log
Call `modify-client-exec-fn-opts` in `eval.file`
2 parents 1c99f32 + 3823914 commit 889d1fe

File tree

2 files changed

+68
-60
lines changed

2 files changed

+68
-60
lines changed

fnl/conjure/eval.fnl

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -92,17 +92,6 @@
9292
(when f
9393
(f result)))))))
9494

95-
(fn M.file []
96-
(event.emit :eval :file)
97-
(let [opts {:file-path (fs.localise-path (extract.file-path))
98-
:origin :file
99-
:action :eval}]
100-
(set opts.preview (preview opts))
101-
(display-request opts)
102-
(client.call
103-
:eval-file
104-
(with-on-result-hook opts))))
105-
10695
(fn assoc-context [opts]
10796
(when (not opts.context)
10897
(set opts.context
@@ -142,6 +131,18 @@
142131

143132
(client.call f-name opts))))
144133

134+
(fn M.file []
135+
(event.emit :eval :file)
136+
(let [opts {:file-path (fs.localise-path (extract.file-path))
137+
:origin :file
138+
:action :eval}]
139+
(set opts.preview (preview opts))
140+
((client-exec-fn :eval :eval-file)
141+
(if opts.passive?
142+
opts
143+
(with-on-result-hook opts)))
144+
nil))
145+
145146
(fn apply-gsubs [code]
146147
(when code
147148
(core.reduce

lua/conjure/eval.lua

Lines changed: 56 additions & 49 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)