From: Dmitry Gutov <dgutov@yandex.ru>
To: Felipe Ochoa <felipeochoa0918@gmail.com>
Cc: 25904@debbugs.gnu.org
Subject: bug#25904: Formatting bug with js-mode
Date: Thu, 23 Nov 2017 23:41:45 +0200 [thread overview]
Message-ID: <ffa9276c-f384-45d4-f806-6d4b53093a15@yandex.ru> (raw)
In-Reply-To: <87y3n0mvzd.fsf@gmail.com>
On 11/21/17 12:22 AM, Felipe Ochoa wrote:
> I've added a test to js.js in the latest patch below.
Thanks.
>> To allow comments between the opening paren and the arglist? Does
>> anybody write them there?
>
> Oops -- this comment was supposed to be after the arrow. I was thinking
> of return type annotation comments, but I just checked flow and I don't
> think they support this. We can just remove the comment
Sure.
> Is there an arglist regexp already in use somewhere? I'd rather not roll
> my own since dealing with default argument values and spreads and such
> seems quite challenging.
No, sorry, I forgot about destructuring and etc. forward-list is fine here.
>> If it's not one regexp, moving some of the new code into a helper
>> function (with a sensible name) seems prudent.
>
> I've done this in the latest patch.
Thanks.
> +(defun js--looking-at-broken-arrow-function-p ()
> + "Helper function for `js--proper-indentation'.
> +Return t if point is at the start of a (possibly async) arrow
> +function and the last non-comment, non-whitespace token of the
> +current like is the \"=>\" token."
> + (and (looking-at "\\s-*\\(async\\s-*\\)?")
This looks weird: the regexp will always match. Better to write it as
(if (looking-at NON-OPT-REGEXP) (goto-char ...)), where NON-OPT-REGEXP
does not include the optional qualifier (?).
And the (save-excursion...) form seems unnecessary, since the caller
already uses it.
> + (save-excursion
> + (goto-char (match-end 0))
> + (cond
> + ((eq (char-after) ?\()
> + (forward-list) ; Is this better than forward-sexp?
I think so: it should be a bit faster, and it doesn't require you to
bind forward-sexp-function to nil (for e.g. js2-mode).
> + (looking-at-p "\\s-*=>\\s-*\\(/[/*]\\|$\\)"))
> + (t (looking-at-p
> + (concat js--name-re "\\s-*=>\\s-*\\(/[/*]\\|$\\)")))))))
Should we extract "\\s-*=>\\s-*\\(/[/*]\\|$\\)" to a local variable, or
a constant?
> (defun js--proper-indentation (parse-status)
> "Return the proper indentation for the current line."
> (save-excursion
> @@ -2107,7 +2124,12 @@ indentation is aligned to that column."
> (continued-expr-p (js--continued-expression-p)))
> (goto-char (nth 1 parse-status)) ; go to the opening char
> (if (or (not js-indent-align-list-continuation)
> - (looking-at "[({[]\\s-*\\(/[/*]\\|$\\)"))
> + (looking-at "[({[]\\s-*\\(/[/*]\\|$\\)")
> + (when (eq (char-after) ?\()
> + (save-excursion
> + (forward-char)
> + (skip-syntax-forward " ")
This seems a bit extraneous: the regexps in the called function all
start with "\\s-*", right? Let's maybe have the one or the other.
> + (js--looking-at-broken-arrow-function-p))))
> (progn ; nothing following the opening paren/bracket
> (skip-syntax-backward " ")
> (when (eq (char-before) ?\)) (backward-list))
> diff --git a/test/manual/indent/js.js b/test/manual/indent/js.js
> index b0d8bca..2286cc1 100644
> --- a/test/manual/indent/js.js
> +++ b/test/manual/indent/js.js
> @@ -144,6 +144,15 @@ bar(
> /abc/
> )
>
> +// #25904
We write references to debbugs as bug#25904. bug-reference-mode can
linkify the result.
> +foo.bar.baz(very =>
> + very
> +).biz(([baz={a: [123]}, boz]) =>
> + baz
> +).snarf((snorf) =>
> + snorf
> +);
> +
Thank you.
Please attach the resulting patch as a file produced by 'git
format-patch', with a ChangeLog style message entry, as described in
CONTRIBUTE.
next prev parent reply other threads:[~2017-11-23 21:41 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAEtRwfDCdNSBPH=1Ohe3sBZJ70QBzJY3nd+Xs0uk85EuA3GRtw@mail.gmail.com>
[not found] ` <CAEtRwfA5_ibO2tmKCDtOHOs9ZCYosn21sKe5gC9LhE3y54GDyQ@mail.gmail.com>
2017-02-28 22:50 ` bug#25904: Formatting bug with js-mode Michael Snead
2017-11-07 23:55 ` Felipe Ochoa
2017-11-12 23:02 ` Dmitry Gutov
2017-11-20 22:22 ` Felipe Ochoa
2017-11-23 21:41 ` Dmitry Gutov [this message]
2018-03-16 1:06 ` Felipe Ochoa
2018-05-04 21:37 ` Dmitry Gutov
2018-04-29 1:20 ` bug#25904: bug#24896: JSX prop indentation after fat arrow Jimmy Yuen Ho Wong
2018-04-29 2:43 ` Eli Zaretskii
2019-02-10 22:03 ` bug#25904: Patches Jackson Ray Hamilton
2019-02-13 0:27 ` Dmitry Gutov
2019-02-13 4:01 ` Jackson Ray Hamilton
2019-02-13 15:15 ` Eli Zaretskii
2019-02-14 1:20 ` Dmitry Gutov
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ffa9276c-f384-45d4-f806-6d4b53093a15@yandex.ru \
--to=dgutov@yandex.ru \
--cc=25904@debbugs.gnu.org \
--cc=felipeochoa0918@gmail.com \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).