[elpa] externals/firefox-javascript-repl 5c47a29fd8 09/24: Remove newlines before sending JavaScript

[Thomas Fitzsimmons]

branch: externals/firefox-javascript-repl
commit 5c47a29fd885d315c032bd44e6c3093e05723f50
Author: Thomas Fitzsimmons <fitzsim@fitzsim.org>
Commit: Thomas Fitzsimmons <fitzsim@fitzsim.org>

    Remove newlines before sending JavaScript
    
    * firefox-javascript-repl.el (fjrepl--input-sender): Remove
    newlines before sending.
    (fjrepl--extract-result): Parse more result types.
---
 firefox-javascript-repl.el | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/firefox-javascript-repl.el b/firefox-javascript-repl.el
index e20602b772..5adacdb448 100644
--- a/firefox-javascript-repl.el
+++ b/firefox-javascript-repl.el
@@ -56,14 +56,18 @@ ARGUMENTS will be used for FORMAT, like `messages'."
 
 (defun fjrepl--input-sender (process string)
   "Send to PROCESS the STRING.  Set `comint-input-sender' to this function."
-  (process-send-string process (fjrepl--format-message
-                                ;; Do not use "eager": true, or stuff like
-                                ;; "alert('hello')" does not work.
-                                (concat "{\"type\":\"evaluateJSAsync\","
-                                        "\"text\":\"%s\","
-                                        "\"to\":\"%s\"}")
-                                (replace-regexp-in-string "\"" "\\\\\"" string)
-                                fjrepl--console-actor)))
+  (let ((send (substring-no-properties
+               (replace-regexp-in-string
+                "\n" " " (replace-regexp-in-string
+                          "\"" "\\\\\"" string)))))
+    ;; (fjrepl--message "Sending %s" send)
+    (process-send-string process (fjrepl--format-message
+                                  ;; Do not use "eager": true, or stuff like
+                                  ;; "alert('hello')" does not work.
+                                  (concat "{\"type\":\"evaluateJSAsync\","
+                                          "\"text\":\"%s\","
+                                          "\"to\":\"%s\"}")
+                                  send fjrepl--console-actor))))
 
 (defconst firefox-javascript-repl--directory
   (file-name-directory load-file-name)
@@ -278,16 +282,21 @@ for output from any processes on which Emacs is waiting.."
   "Filter the process NETWORK.
 RESPONSE is a Firefox Debug Protocol message received from the
 browser.  Return the result of the JavaScript evaluation."
+  ;; (fjrepl--message "%S" response)
   (let* ((result (with-temp-buffer
                    (insert response)
                    (fjrepl--get-result
                     (current-buffer) nil "result")))
-         (parsed (and (hash-table-p result)
+         (parsed (and result (hash-table-p result)
                       (gethash "result" result)))
          (string (and parsed
-                      (format "%s" (if (hash-table-p parsed)
-                                       (gethash "type" parsed)
-                                     parsed)))))
+                      (format "%s"
+                              (if (and parsed (hash-table-p parsed))
+                                  (let ((preview (gethash "preview" parsed)))
+                                    (if preview
+                                        (gethash "items" preview)
+                                      (gethash "type" parsed)))
+                                (if parsed parsed ""))))))
     (when string
       (comint-output-filter network (concat string "\n" fjrepl--prompt)))))