Skip to content

Update Emacs tools #1393

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

Merged
merged 4 commits into from
Dec 2, 2025
Merged

Update Emacs tools #1393

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac3ff0e
update diff tool
zorkow Feb 26, 2025
cb2c67a
Merge branch 'develop' into update/tools
zorkow Nov 28, 2025
6e61db2
ensure cl-lib is loaded for jest diff tools
zorkow Nov 28, 2025
c716141
update copyright
zorkow Nov 28, 2025
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
15 changes: 8 additions & 7 deletions testsuite/scripts/test-diff.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
;;; Tools for working with Jest tests in Emacs.
;;;
;;;
;;; Copyright (c) 2024 The MathJax Consortium
;;; Copyright (c) 2024-5 The MathJax Consortium

(require 'ediff)
(require 'cl-lib)

;;; Jest Tests
;;; ==========
Expand All @@ -17,7 +18,7 @@
;;;

(defun jest-find-expected ()
(block find-fail-block
(cl-block find-fail-block
(let ((expected (condition-case nil
(search-forward "Expected value")
(error nil))))
Expand All @@ -31,19 +32,19 @@
(defun jest-find-fail ()
;; Returns start end for actual and expected and position of fail o/w nil.
(interactive)
(block find-fail-block
(cl-block find-fail-block
(let ((pos (condition-case nil
(search-forward "●" nil t)
(error nil))))
(when (null pos)
(return-from find-fail-block nil))
(cl-return-from find-fail-block nil))
(let ((expected (jest-find-expected))
(actual (condition-case nil
(search-forward "Received:")
(error nil)))
)
(when (or (null actual) (null expected))
(return-from find-fail-block nil))
(cl-return-from find-fail-block nil))
(let* ((beg1 (progn
(goto-char actual)
(search-forward "\"")
Expand Down Expand Up @@ -88,7 +89,7 @@
(condition-case nil
(search-forward "Summary of all failing tests")
(error (beginning-of-buffer)))
(do ((fail (jest-find-fail) (jest-find-fail)))
(cl-do ((fail (jest-find-fail) (jest-find-fail)))
((null fail) nil)
(print fail)
(append-to-buffer bufferA (caadr fail) (cdadr fail))
Expand All @@ -102,7 +103,7 @@
;;; Go to position where you want the next test inserted.
(defun jest-replace-expected-for-actual ()
(interactive)
(block expected-block
(cl-block expected-block
(other-window 1)
(let* ((fail (jest-find-fail))
(actual (car (fourth fail)))
Expand Down