From: Tom Tromey <tom@tromey.com>
To: Tom Tromey <tom@tromey.com>
Cc: 19399@debbugs.gnu.org,
Daniel Colascione <dan.colascione@gmail.com>,
npostavs@users.sourceforge.net
Subject: bug#19399: js mode comment-filling fixlet
Date: Mon, 09 Jan 2017 20:40:14 -0700 [thread overview]
Message-ID: <87k2a31t29.fsf@tromey.com> (raw)
In-Reply-To: <87wpe6149s.fsf@tromey.com> (Tom Tromey's message of "Sat, 07 Jan 2017 22:58:55 -0700")
Tom> I think I should perhaps write some tests for this patch.
Here's the patch with tests. I couldn't actually find a way to make the
contents of c-block-comment-start-regexp matter.
Tom
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index e3f64a8..1484b79 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3760,6 +3760,8 @@ js-mode
c-line-comment-starter "//"
c-comment-start-regexp "/[*/]\\|\\s!"
comment-start-skip "\\(//+\\|/\\*+\\)\\s *")
+ (setq-local comment-line-break-function #'c-indent-new-comment-line)
+ (setq-local c-block-comment-start-regexp "/\\*")
(setq-local electric-indent-chars
(append "{}():;," electric-indent-chars)) ;FIXME: js2-mode adds "[]*".
diff --git a/test/lisp/progmodes/js-tests.el b/test/lisp/progmodes/js-tests.el
new file mode 100644
index 0000000..9bf7258
--- /dev/null
+++ b/test/lisp/progmodes/js-tests.el
@@ -0,0 +1,64 @@
+;;; js-tests.el --- Test suite for js-mode
+
+;; Copyright (C) 2017 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'ert)
+(require 'js)
+
+(ert-deftest js-mode-fill-bug-19399 ()
+ (with-temp-buffer
+ (insert "/")
+ (save-excursion (insert "/ comment"))
+ (js-mode)
+ (fill-paragraph)
+ (should (equal (buffer-substring (point-min) (point-max))
+ "// comment"))))
+
+(ert-deftest js-mode-fill-bug-22431 ()
+ (with-temp-buffer
+ (insert "/**\n")
+ (insert " * Load the inspector's shared head.js for use by tests that ")
+ (insert "need to open the something or other")
+ (js-mode)
+ ;; This fails with auto-fill but not fill-paragraph.
+ (do-auto-fill)
+ (should (equal (buffer-substring (point-min) (point-max))
+ "/**
+ * Load the inspector's shared head.js for use by tests that need to
+ * open the something or other"))))
+
+(ert-deftest js-mode-fill-bug-22431-fill-paragraph-at-start ()
+ (with-temp-buffer
+ (insert "/**\n")
+ (insert " * Load the inspector's shared head.js for use by tests that ")
+ (insert "need to open the something or other")
+ (js-mode)
+ (goto-char (point-min))
+ (fill-paragraph)
+ (should (equal (buffer-substring (point-min) (point-max))
+ "/**
+ * Load the inspector's shared head.js for use by tests that need to
+ * open the something or other"))))
+
+(provide 'js-tests)
+
+;;; js-tests.el ends here
next prev parent reply other threads:[~2017-01-10 3:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-17 19:41 bug#19399: 24.4; fill-paragraph always errors on second slash of // in js-mode Taylor Venable
2017-01-08 5:17 ` bug#19399: js mode comment-filling fixlet Tom Tromey
2017-01-08 5:45 ` npostavs
2017-01-08 5:58 ` Tom Tromey
2017-01-10 3:40 ` Tom Tromey [this message]
2017-01-12 2:12 ` Dmitry Gutov
2017-01-12 3:52 ` Tom Tromey
2017-01-14 17:46 ` bug#19399: done Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87k2a31t29.fsf@tromey.com \
--to=tom@tromey.com \
--cc=19399@debbugs.gnu.org \
--cc=dan.colascione@gmail.com \
--cc=npostavs@users.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.