Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support Node.js 12 and stop supporting Node.js 7 or earlier #25

Merged
merged 3 commits into from
Jun 16, 2019
Merged

Support Node.js 12 and stop supporting Node.js 7 or earlier #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b7bc82
Support Node.js 12
abicky Jun 16, 2019
ba95aa3
Stop supporting Node.js 7 or earlier
abicky Jun 16, 2019
a9151ce
Sleep a few seconds using busy loop to shorten the test time
abicky Jun 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,16 @@
language: node_js
node_js:
- 6
- 8
- 10
- 12

env:
- EVM_EMACS=emacs-24.5-travis
- EVM_EMACS=emacs-25.1-travis
- EVM_EMACS=emacs-25.2-travis
- EVM_EMACS=emacs-25.3-travis
- EVM_EMACS=emacs-26.1-travis

matrix:
exclude:
- node_js: 6
env: EVM_EMACS=emacs-25.1-travis
- node_js: 6
env: EVM_EMACS=emacs-25.2-travis
- node_js: 6
env: EVM_EMACS=emacs-25.3-travis
- node_js: 6
env: EVM_EMACS=emacs-26.1-travis
- EVM_EMACS=emacs-26.2-travis

before_install:
- curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > x.sh && source ./x.sh
Expand Down
10 changes: 6 additions & 4 deletions nodejs-repl.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ when receive the output string"

(defun nodejs-repl--get-completions-from-process (token)
"Get completions sending TAB to Node.js process."
(let ((ret (if (version< nodejs-repl-nodejs-version "7.0.0")
(nodejs-repl--send-string (concat token "\t"))
(let ((ret (progn
;; Send TAB twice cf. https://github.com/nodejs/node/pull/7754
(nodejs-repl--send-string (concat token "\t"))
(nodejs-repl--send-string "\t")))
completions)
Expand Down Expand Up @@ -532,8 +532,10 @@ otherwise spawn one."
(nodejs-repl-code (format nodejs-repl-code-format
nodejs-repl-prompt nodejs-repl-use-global repl-mode)))
(pop-to-buffer
(apply 'make-comint nodejs-repl-process-name node-command nil
`(,@nodejs-repl-arguments "-e" ,nodejs-repl-code)))
;; Node.js 12 ignores almost all keys if TERM is "dumb"
;; cf. https://github.com/nodejs/node/commit/d3a62fe7fc683bf74b3e9c743f73471f0167bd15
(apply 'make-comint nodejs-repl-process-name "env" nil
`("TERM=xterm" ,node-command ,@nodejs-repl-arguments "-e" ,nodejs-repl-code)))
(nodejs-repl-mode))))

(provide 'nodejs-repl)
Expand Down
14 changes: 7 additions & 7 deletions test/test.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
(eq orig-marker (marker-position (process-mark proc)))
(eq orig-filter (process-filter proc))
(eq orig-buf (process-buffer proc)))))
(expect "100000000" ; waits for finishing commands
(let ((ret (nodejs-repl--send-string "for (i = 0; i < 100000000; i++) {} console.log(i)\n")))
(nth 1 (split-string ret "\r\n"))))
;; TODO
;; (expect "100000000" ; waits for finishing commands
;; (let ((ret (nodejs-repl-send-string "for (i = 0; i < 20000000; i++) if (!(i % 10000000))process.stdout.write(\"\"+i)\n")))
;; (nth 1 (split-string ret "\r\n"))))
(expect '("2" "undefined") ; waits for finishing commands
(let* ((ret (nodejs-repl--send-string "s = Date.now(); while ((d = (Date.now() - s) / 1000 | 0) < 2); console.log(d)\n"))
(i-value (nth 1 (split-string ret "\r\n")))
(return-value (nth 2 (split-string ret "\r\n"))))
(list
(ansi-color-filter-apply i-value)
(ansi-color-filter-apply return-value))))

(desc "nodejs-repl-execute")
(expect "2\n"
Expand Down