Discard should apply to all output until control char

Author: joshbax189

js-comint-test.el

@@ -213,3 +213,30 @@ Array.valueOf
       "Array.propertyIsEnumerable"
       "Array.toLocaleString"
       "Array.valueOf"))))
+
+(ert-deftest js-comint--completion-filter/test-discard ()
+  "Output should be discarded."
+  (with-temp-buffer
+    (js-comint--reset-completion-state)
+    (setq js-comint--discard-output 't)
+    ;; each should be empty
+    (dolist (res (list (js-comint--completion-filter "foo")
+                       (js-comint--completion-filter "bar")
+                       (js-comint--completion-filter "")))
+     (should (string-empty-p res)))
+    ;; then the the flag should be cleared
+    (should-not js-comint--discard-output)))
+
+(ert-deftest js-comint--completion-filter/test-discard-with-completion ()
+  "Output should be discarded even when completion callback is set."
+  (with-temp-buffer
+    (js-comint--reset-completion-state)
+    (setq js-comint--discard-output 't)
+    (setq js-comint--post-completion-cb #'ignore)
+    ;; each should be empty
+    (dolist (res (list (js-comint--completion-filter "foo")
+                       (js-comint--completion-filter "bar")
+                       (js-comint--completion-filter "")))
+      (should (string-empty-p res)))
+    ;; the output should not be accumulated
+    (should (string-empty-p js-comint--completion-output))))

js-comint.el

@@ -320,12 +320,12 @@ PREFIX is the original completion prefix string."
   (message "|%s|" output)
 
   ;; discard should work independently so that clear-repl-input can be used
-  (when (and js-comint--discard-output
-             (string-match-p "\\[[[:digit:]]+[AG]$" output))
-    (when (functionp js-comint--discard-output)
-      (funcall js-comint--discard-output output))
-    (setq js-comint--discard-output nil
-          output ""))
+  (when js-comint--discard-output
+    (when (string-match-p "\\[[[:digit:]]+[AG]$" output)
+      (when (functionp js-comint--discard-output)
+        (funcall js-comint--discard-output output))
+      (setq js-comint--discard-output nil))
+    (setq output ""))
 
   (when js-comint--post-completion-cb
     (message "collecting output")