Skip to content

Verify highlighting range is in sync with WikiWord range #861

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
matsl merged 2 commits into from
Feb 10, 2026
Merged

Verify highlighting range is in sync with WikiWord range #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e11d31
Verify highlighting range is in sync with WikiWord range
matsl Feb 9, 2026
6773d56
Review update
matsl Feb 10, 2026
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
11 changes: 7 additions & 4 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
2026-02-09 Mats Lidell <matsl@gnu.org>

* test/hywiki-tests.el (hywiki-tests--run-test-case): Use pos as given
by the step definition. If an illegal position results the test
specification is wrong and need to be changed. Give an error
message that explains the problem.
* test/hywiki-tests.el (hywiki-tests--word-at): Extend verification to
verify that the range of the WikiWord and the range of the
highlighted text is equal iff a highlighted WikiWord exists.
(hywiki-tests--run-test-case): Use pos as given by the step
definition. If an illegal position results the test specification is
wrong and need to be changed. Give an error message that explains the
problem.

2026-02-09 Bob Weiner <rsw@gnu.org>

Expand Down
23 changes: 17 additions & 6 deletions test/hywiki-tests.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1493,12 +1493,23 @@ comparison with expected overlays stable."
"Non-nil to perform face validation of WikiWord.")

(defun hywiki-tests--word-at ()
"Test if there is a HyWikiWord reference at point with a referent.
Choose what test to perform based on value of `hywiki-tests--with-face-test'."
(when (hywiki-referent-exists-p)
(if hywiki-tests--with-face-test
(hywiki-highlighted-word-at)
(hywiki-word-at))))
"Return potential HyWikiWord and optional #section:Lnum:Cnum at point or nil.
When `hywiki-tests--with-face-test' is non-nil the HyWikiWord must be
highlighted to be returned. When it is highlighted, the range of the
highlighting and the range of the HyWikiWord is, as a side effect,
checked for consistency."
(let* ((range (hywiki-referent-exists-p :range))
(wikiword (car range)))
(when wikiword
(if (not hywiki-tests--with-face-test)
wikiword
(save-excursion
(goto-char (round (/ (+ (cadr range) (caddr range)) 2.0)))
(let* ((highlighted-range (hywiki-highlighted-word-at :range))
(highlighted-wikiword (car highlighted-range)))
(when highlighted-wikiword
(should (equal range highlighted-range)))
highlighted-wikiword))))))

(defun hywiki-tests--verify-hywiki-word (step expected)
"Verify that `hywiki-word-at' returns t if a wikiword is EXPECTED.
Expand Down