Merge branch 'release/0.2.4'

Author: abicky

.github/workflows/test.yml

@@ -8,13 +8,11 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     strategy:
       fail-fast: false
       matrix:
         emacs-version:
-          - '24.5'
-          - '25.1'
-          - '25.2'
           - '25.3'
           - '26.1'
           - '26.2'

nodejs-repl.el

@@ -3,7 +3,7 @@
 ;; Copyright (C) 2012-2020  Takeshi Arabiki
 
 ;; Author: Takeshi Arabiki
-;; Version: 0.2.3
+;; Version: 0.2.4
 
 ;;  This program is free software: you can redistribute it and/or modify
 ;;  it under the terms of the GNU General Public License as published by
@@ -22,9 +22,10 @@
 ;;
 ;; This program is derived from comint-mode and provides the following features.
 ;;
-;;  * TAB completion same as Node.js REPL
+;;  * token completion, same as Node.js REPL
 ;;  * file name completion in string
 ;;  * incremental history search
+;;  * sending JavaScript codes to REPL
 ;;
 ;;
 ;; Put this file in your Emacs lisp path (e.g. ~/.emacs.d/site-lisp)
@@ -40,6 +41,7 @@
 ;;     (add-hook 'js-mode-hook
 ;;               (lambda ()
 ;;                 (define-key js-mode-map (kbd "C-x C-e") 'nodejs-repl-send-last-expression)
+;;                 (define-key js-mode-map (kbd "C-c C-j") 'nodejs-repl-send-line)
 ;;                 (define-key js-mode-map (kbd "C-c C-r") 'nodejs-repl-send-region)
 ;;                 (define-key js-mode-map (kbd "C-c C-l") 'nodejs-repl-load-file)
 ;;                 (define-key js-mode-map (kbd "C-c C-z") 'nodejs-repl-switch-to-repl)))
@@ -73,7 +75,7 @@
   "Run Node.js REPL and communicate the process."
   :group 'processes)
 
-(defconst nodejs-repl-version "0.2.3"
+(defconst nodejs-repl-version "0.2.4"
   "Node.js mode Version.")
 
 (defcustom nodejs-repl-command "node"
@@ -223,7 +225,7 @@ See also `comint-process-echoes'"
              (not
               (let ((last-line (process-get proc 'last-line)))
                 (or (string-match-p nodejs-repl-prompt-re last-line)
-                    (string= last-line string)))))
+                    (string-prefix-p string last-line)))))
     (process-put proc 'running-p nil)
     (accept-process-output proc interval)))
 
@@ -308,7 +310,9 @@ when receive the output string"
 
 (defun nodejs-repl--delete-prompt (string)
   ;; Redundant prompts are included in outputs from Node.js REPL
-  (when nodejs-repl-prompt-deletion-required-p
+  (when (and nodejs-repl-prompt-deletion-required-p
+             ;; To avoid end-of-buffer error at the line of (forward-char (length nodejs-repl-prompt))
+             (> (buffer-size) 0))
     (setq nodejs-repl-prompt-deletion-required-p nil)
     (let ((beg (or comint-last-output-start
                    (point-min-marker)))
@@ -455,9 +459,7 @@ when receive the output string"
     ;; See: https://github.com/abicky/nodejs-repl.el/issues/17
     (comint-send-string proc ".editor\n")
     (comint-send-region proc start end)
-    (comint-send-string proc "\n")
-    (with-current-buffer (process-buffer proc)
-      (comint-send-eof))))
+    (comint-send-string proc "\n\x04")))
 
 ;;;###autoload
 (defun nodejs-repl-send-buffer ()

test/test.el

@@ -1,12 +1,18 @@
+(require 'nodejs-repl)
 (require 'ert-expectations)
 
+(nodejs-repl)
+
 (expectations
   (desc "run Node.js REPL")
-  (expect nil
-    (require 'nodejs-repl)
+  (expect nodejs-repl-prompt
     ;; TODO: set adjust window width (candidates will change according to the width)
     ;;(adjust-window-trailing-edge (selected-window) (- 100 (window-width)) t)
-    (nodejs-repl))
+    (with-current-buffer (process-buffer (nodejs-repl--get-or-create-process))
+      (with-timeout (10 (error "timeout"))
+        (while (equal (buffer-string) "")
+            (sleep-for 0.1))
+        (buffer-string))))
 
   (desc "nodejs-repl--get-last-token")
   (expect "$._foo0"
@@ -35,6 +41,34 @@
        (ansi-color-filter-apply i-value)
        (ansi-color-filter-apply return-value))))
 
+  (desc "nodejs-repl-send-region")
+  (expect t
+    (let* ((proc (nodejs-repl--get-or-create-process))
+           (buf (process-buffer proc)))
+      ;; Emulate the case of https://github.com/abicky/nodejs-repl.el/issues/31
+      (comint-send-string proc "1\n")
+      (with-current-buffer buf
+        (with-timeout (10 (error "timeout"))
+          (while (not (string-suffix-p "> 1\n1\n> " (ansi-color-filter-apply (buffer-string))))
+            (sleep-for 0.1))))
+      (with-current-buffer (process-buffer (nodejs-repl--get-or-create-process))
+        (goto-char (point-min)))
+
+      (with-temp-buffer
+        (insert "2")
+        (nodejs-repl-send-region (point-min) (point-max)))
+      (with-current-buffer buf
+        (with-timeout (10 (error "timeout"))
+          (while (string-suffix-p "> 1\n1\n> " (ansi-color-filter-apply (buffer-string)))
+            (sleep-for 0.1)))
+        ;; > .editor
+        ;; // Entering editor mode (^D to finish, ^C to cancel)
+        ;; 2
+        ;;
+        ;; 2
+        ;; >
+        (string-suffix-p "2\n\n2\n> " (ansi-color-filter-apply (buffer-string))))))
+
   (desc "nodejs-repl-execute")
   (expect "2\n"
     (nodejs-repl-execute "1 +\n1")