[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 2a8f458719a: Fix perl-mode indentation after a hanging paren
From: |
Stefan Kangas |
Subject: |
master 2a8f458719a: Fix perl-mode indentation after a hanging paren |
Date: |
Wed, 6 Sep 2023 18:14:39 -0400 (EDT) |
branch: master
commit 2a8f458719a622487a136162c1dc7b015bd427e3
Author: Mauro Aranda <maurooaranda@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>
Fix perl-mode indentation after a hanging paren
* lisp/progmodes/perl-mode.el (perl-hanging-paren-p): Allow
comments. (Bug#34245)
* test/lisp/progmodes/perl-mode-tests.el (perl-test-bug-34245): New
test.
---
lisp/progmodes/perl-mode.el | 2 +-
test/lisp/progmodes/perl-mode-tests.el | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index ab6333e4b23..aa130966d75 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -968,7 +968,7 @@ changed by, or (parse-state) if line starts in a quoted
string."
(defun perl-hanging-paren-p ()
"Non-nil if we are right after a hanging parenthesis-like char."
- (and (looking-at "[ \t]*$")
+ (and (looking-at "[ \t]*\\(?:#.*\\)?$")
(save-excursion
(skip-syntax-backward " (") (not (bolp)))))
diff --git a/test/lisp/progmodes/perl-mode-tests.el
b/test/lisp/progmodes/perl-mode-tests.el
index 3757ac25547..a47a6722e20 100644
--- a/test/lisp/progmodes/perl-mode-tests.el
+++ b/test/lisp/progmodes/perl-mode-tests.el
@@ -28,6 +28,23 @@
(font-lock-ensure (point-min) (point-max))
(should (equal (get-text-property 4 'face)
'font-lock-variable-name-face))))
+(ert-deftest perl-test-bug-34245 ()
+ "Test correct indentation after a hanging paren, with and without comments."
+ (with-temp-buffer
+ (perl-mode)
+ (insert "my @foo = (\n\"bar\",\n\"baz\",\n);")
+ (insert "\n\n")
+ (insert "my @ofoo = (\t\t# A comment.\n\"obar\",\n\"obaz\",\n);")
+ (indent-region (point-min) (point-max))
+ (goto-char (point-min))
+ (forward-line)
+ (skip-chars-forward " \t")
+ (should (equal (current-column) perl-indent-level))
+ (search-forward "# A comment.")
+ (forward-line)
+ (skip-chars-forward " \t")
+ (should (equal (current-column) perl-indent-level))))
+
;;;; Re-use cperl-mode tests
(defvar cperl-test-mode)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 2a8f458719a: Fix perl-mode indentation after a hanging paren,
Stefan Kangas <=