Merge branch 'austinmlv-guile-output' into develop

Author: Olical

.nvim.fnl

@@ -8,6 +8,9 @@
 ; (set vim.g.conjure#client#scheme#stdio#prompt_pattern "\n-#;%d-> ")
 ; (set vim.g.conjure#mapping#enable_defaults false)
 
+; (set vim.g.conjure#filetype#scheme "conjure.client.guile.socket")
+; (set vim.g.conjure#client#guile#socket#pipename "guile-repl.socket")
+
 ; (set vim.g.conjure#client#python#stdio#command "ipython --classic")
 
 

dev/guile/sandbox.scm

@@ -5,3 +5,16 @@
 
 (+ 5 6)
 (add 1 2)
+
+(define (print-hi-and-return x)
+  (begin
+    (display "Hi")
+    (newline))
+  x)
+
+(print-hi-and-return 123)
+
+(define (return-values)
+  (values 123 "Hi"))
+
+(return-values)

fnl/conjure/client/guile/socket.fnl

@@ -115,22 +115,28 @@
 
 (defn- parse-guile-result [s]
   (let [prompt (s:find "scheme@%([%w%-%s]+%)> ")]
-    (if prompt
-      (let [(ind1 ind2 result) (s:find "%$%d+ = ([^\n]+)\n")]
-        (if result
-          {:done? true
-           :error? false
-           :result result}
-          {:done? true
-           :error? false
-           :result (s:sub 1 (- prompt 1))}))
-      (if (s:find "scheme@%([%w%-%s]+%) %[%d+%]>")
+    (if
+      prompt
+      (let [(ind1 _ result) (s:find "%$%d+ = ([^\n]+)\n")
+            stray-output (s:sub
+                           1
+                           (- (if result ind1 prompt) 1))]
+        (when (> (length stray-output) 0)
+          (log.append
+            (-> (text.trim-last-newline stray-output)
+                (text.prefixed-lines "; (out) "))))
         {:done? true
-         :error? true
-         :result nil}
-        {:done? false
          :error? false
-         :result s}))))
+         :result result})
+
+      (s:find "scheme@%([%w%-%s]+%) %[%d+%]>")
+      {:done? true
+       :error? true
+       :result nil}
+
+      {:done? false
+       :error? false
+       :result s})))
 
 (defn connect [opts]
   (disconnect)

fnl/conjure/sponsors.fnl

@@ -1,5 +1,4 @@
 [ ;; Generated by: make sponsors
-"AbhinavOmprakash"
 "Akeboshiwind"
 "aleksandersumowski"
 "AlexChalk"