masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-06 12:19:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix xref elisp identifier namespace mistake

Browse source 
Pressing `M-.` on ALPHA in

  (let ((ALPHA BETA)) ...)

would incorrectly search for ALPHA as a function rather than a variable.

* lisp/progmodes/elisp-mode.el (elisp--xref-infer-namespace): Fix logic.
* test/lisp/progmodes/elisp-mode-tests.el
(elisp-mode-infer-namespace): Add test case.
This commit is contained in:
Mattias Engdegård 2021-10-18 17:06:22 +02:00
parent c163fd9260
commit bb4209a5a5
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/progmodes/elisp-mode.el
View file

@ -877,17 +877,17 @@ namespace but with lower confidence."
;; ^ index K ^ index J ^ index I ;; ^ index K ^ index J ^ index I
(let* ((i (elisp--xref-list-index)) (let* ((i (elisp--xref-list-index))
(i-head (looking-at-sym)) (i-head (looking-at-sym))
(i-paren (and i-head (eq (char-before) ?\() (i-paren (and i (eq (char-before) ?\()
(progn (backward-char) t))) (progn (backward-char) t)))
(i-quoted (and i-paren (memq (char-before) '(?\' ?`)))) (i-quoted (and i-paren (memq (char-before) '(?\' ?`))))
(j (and i-paren (elisp--xref-list-index))) (j (and i-paren (elisp--xref-list-index)))
(j-head (and j (looking-at-sym))) (j-head (and j (looking-at-sym)))
(j-paren (and j-head (eq (char-before) ?\() (j-paren (and j (eq (char-before) ?\()
(progn (backward-char) t))) (progn (backward-char) t)))
(j-quoted (and j-paren (memq (char-before) '(?\' ?`)))) (j-quoted (and j-paren (memq (char-before) '(?\' ?`))))
(k (and j-paren (elisp--xref-list-index))) (k (and j-paren (elisp--xref-list-index)))
(k-head (and k (looking-at-sym))) (k-head (and k (looking-at-sym)))
(k-paren (and k-head (eq (char-before) ?\() (k-paren (and k (eq (char-before) ?\()
(progn (backward-char) t))) (progn (backward-char) t)))
(k-quoted (and k-paren (memq (char-before) '(?\' ?`))))) (k-quoted (and k-paren (memq (char-before) '(?\' ?`)))))
(cond (cond

11
test/lisp/progmodes/elisp-mode-tests.el
View file

@ -976,6 +976,17 @@ evaluation of BODY."
(should (equal (elisp--xref-infer-namespace p6) 'maybe-variable)) (should (equal (elisp--xref-infer-namespace p6) 'maybe-variable))
(should (equal (elisp--xref-infer-namespace p7) 'variable))) (should (equal (elisp--xref-infer-namespace p7) 'variable)))
(elisp-mode-test--with-buffer
(concat "(let (({p1}alpha {p2}beta)\n"
" ({p3}gamma ({p4}delta {p5}epsilon)))\n"
" ({p6}zeta))\n")
(should (equal (elisp--xref-infer-namespace p1) 'variable))
(should (equal (elisp--xref-infer-namespace p2) 'variable))
(should (equal (elisp--xref-infer-namespace p3) 'variable))
(should (equal (elisp--xref-infer-namespace p4) 'function))
(should (equal (elisp--xref-infer-namespace p5) 'maybe-variable))
(should (equal (elisp--xref-infer-namespace p6) 'function)))
(elisp-mode-test--with-buffer (elisp-mode-test--with-buffer
(concat "(defun {p1}alpha () {p2}beta)\n" (concat "(defun {p1}alpha () {p2}beta)\n"
"(defface {p3}gamma ...)\n" "(defface {p3}gamma ...)\n"