mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 11:00:45 -08:00
Code Issues Projects Releases Wiki Activity

; cperl-mode.el: Fix fontification error with signatures

Browse source 
This fixes the second issue in Bug#79269.

* lisp/progmodes/cperl-mode.el (cperl-init-faces): Move handling
of signatures with initializers from the "anchor" to the
"anchored" matcher

* test/lisp/progmodes/cperl-mode-resources/proto-and-attrs.pl (sub_7):
Test case for Bug#79269, wrong face report

* test/lisp/progmodes/cperl-mode-tests.el
(cperl-test-fontify-attrs-and-signatures): Make sure that the test
catches sub_7 for Bug#79269
This commit is contained in:
Harald Jörg 2025-08-22 01:26:28 +02:00
parent 680ef7b5f0
commit a419e92bc6
3 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lisp/progmodes/cperl-mode.el
View file

@ -6374,9 +6374,7 @@ functions (which they are not). Inherits from `default'.")
(sequence (eval cperl--signature-rx) (sequence (eval cperl--signature-rx)
(eval cperl--ws*-rx)) (eval cperl--ws*-rx))
;; ... or the start of a "sloppy" signature ;; ... or the start of a "sloppy" signature
(sequence (eval cperl--sloppy-signature-rx) (sequence (eval cperl--sloppy-signature-rx))
;; arbitrarily continue "a few lines"
(repeat 0 200 (not (in "{"))))
;; make sure we have a reasonably ;; make sure we have a reasonably
;; short match for an incomplete sub ;; short match for an incomplete sub
(not (in ";{(")) (not (in ";{("))
@ -6392,7 +6390,13 @@ functions (which they are not). Inherits from `default'.")
(group (eval cperl--basic-variable-rx)))) (group (eval cperl--basic-variable-rx))))
(progn (progn
(goto-char (match-beginning 2)) ; pre-match: Back to sig (goto-char (match-beginning 2)) ; pre-match: Back to sig
(match-end 2)) ;; While typing, forward-sexp might fail with a scan error.
;; If so, stop looking for declarations at (match-end 2)
(condition-case nil
(save-excursion
(forward-sexp)
(point))
(error (match-end 2))))
nil nil
(1 font-lock-variable-name-face))) (1 font-lock-variable-name-face)))
;; -------- flow control ;; -------- flow control

7
test/lisp/progmodes/cperl-mode-resources/proto-and-attrs.pl
View file

@ -41,6 +41,13 @@ sub sub_6
{ {
} }
# Braces in initializers (Bug79269)
sub sub_7
($foo = { },
$bar //= "baz")
{
}
# Part 2: Same constructs for anonymous subs # Part 2: Same constructs for anonymous subs
# A plain named subroutine without any optional stuff # A plain named subroutine without any optional stuff

2
test/lisp/progmodes/cperl-mode-tests.el
View file

@ -173,7 +173,7 @@ attributes, prototypes and signatures."
(should (equal (get-text-property (match-beginning 0) 'face) (should (equal (get-text-property (match-beginning 0) 'face)
'font-lock-function-name-face)) 'font-lock-function-name-face))
(let ((start-of-sub (match-beginning 0)) (let ((start-of-sub (match-beginning 0))
(end-of-sub (save-excursion (search-forward "}") (point)))) (end-of-sub (save-excursion (search-forward "}\n") (point))))
;; Prototypes are shown as strings ;; Prototypes are shown as strings
(when (search-forward-regexp " ([$%@*]*) " end-of-sub t) (when (search-forward-regexp " ([$%@*]*) " end-of-sub t)