mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

; cperl-mode.el: Don't override fontificaton in comments.

Browse source 
* lisp/progmodes/cperl-mode.el (cperl-init-faces): Reorder the
matchers for fontification of array and hash elements and keys so
that they don't override comment and string fontification (Bug#66145).

* test/lisp/progmodes/cperl-mode-tests.el (cperl-test-bug-66145):
New test for all combinations of sigils and brackets/braces to
verify that strings and comments are left untouched.  This test
also works for perl-mode which has always done it correctly.

* test/lisp/progmodes/cperl-mode-resources/cperl-bug-66145.pl: New
resource file for the above test.
This commit is contained in:
Harald Jörg 2023-10-09 17:49:15 +02:00
parent 156392fee5
commit fc1f6688a2
3 changed files with 138 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

62
test/lisp/progmodes/cperl-mode-resources/cperl-bug-66145.pl Normal file
View file

@ -0,0 +1,62 @@
# The original code, from the bug report, with variables renamed
sub foo {
# Here we do something like
# this: $array_comment [ num_things ]->{key_comment}
}
# --------------------------------------------------
# Comments containing hash and array sigils
# This is an @array, and this is a %hash
# $array_comment[$index] = $hash_comment{key_comment}
# The last element has the index $#array_comment
# my @a_slice = @array_comment[1,2,3];
# my @h_slice = @hash_comment{qw(a b c)};
# my %a_set = %array_comment[1,2,3];
# my %h_set = %hash_comment{qw(a b c)};
# --------------------------------------------------
# in POD
=head1 NAME
cperl-bug-66145 - don't fontify arrays and hashes in POD
=head1 SYNOPSIS
$array_comment[$index] = $hash_comment{key_comment};
@array_comment = qw(in pod);
%hash_comment = key_comment => q(pod);
@array_comment = @array_comment[1,2,3];
@array_comment = @hash_comment{qw(a b c)};
%hash_comment = %array_comment[1,2,3];
%hash_comment = %hash_comment{qw(a b c)};
=cut
# --------------------------------------------------
# in strings
my @strings = (
q/$array_string[$index] = $hash_string{key_string};/,
q/my @array_string = qw(in unquoted string);/,
q/my %hash_string = (key_string => q(pod);)/,
q/@array_string = @array_string[1,2,3];/,
q/@array_string = @hash_string{qw(a b c)};/,
q/%hash_string = %array_string[1,2,3];/,
q/%hash_string = %hash_string{qw(a b c)};/,
);
# --------------------------------------------------
# in a HERE-document (perl-mode has an extra face for that)
my $here = <<DONE;
$array_here[$index_here] = $hash_here{key_here};
@array_here = qw(in a hrere-document);
%hash_here = key_here => q(pod);
@array_here = @array_here[1,2,3];
@array_here = @hash_here{qw(a b c)};
%hash_here = %array_here[1,2,3];
%hash_here = %hash_here{qw(a b c)};
DONE

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

@ -1379,6 +1379,29 @@ as a regex."
(forward-line 1))))
(cperl-set-style-back))
(ert-deftest cperl-test-bug-66145 ()
"Verify that hashes and arrays are only fontified in code.
In strings, comments and POD the syntaxified faces should
prevail. The tests exercise all combinations of sigils $@% and
parenthesess [{ for comments, POD, strings and HERE-documents.
Fontification in code for `cperl-mode' is done in the tests
beginning with `cperl-test-unicode`."
(let ((types '("array" "hash" "key"))
(faces `(("string" . font-lock-string-face)
("comment" . font-lock-comment-face)
("here" . ,(if (equal cperl-test-mode 'perl-mode)
'perl-heredoc
font-lock-string-face)))))
(with-temp-buffer
(insert-file-contents (ert-resource-file "cperl-bug-66145.pl"))
(funcall cperl-test-mode)
(font-lock-ensure)
(dolist (type types)
(goto-char (point-min))
(while (re-search-forward (concat type "_\\([a-z]+\\)") nil t)
(should (equal (get-text-property (match-beginning 1) 'face)
(cdr (assoc (match-string-no-properties 1)
faces)))))))))
(ert-deftest test-indentation ()
(ert-test-erts-file (ert-resource-file "cperl-indents.erts")))