From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: James Nguyen Newsgroups: gmane.emacs.bugs Subject: bug#27503: 26.0.50; Not lining up Javascript arguments Date: Tue, 27 Jun 2017 12:42:34 -0700 Message-ID: <1498592554.2776738.1023241160.654C742F@webmail.messagingengine.com> References: <87FF3D96-DBCF-4EBD-8E72-3F796AB89FF1@fastmail.com> <87fuel70up.fsf@acer.localhost.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Trace: blaine.gmane.org 1498595788 19619 195.159.176.226 (27 Jun 2017 20:36:28 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 27 Jun 2017 20:36:28 +0000 (UTC) To: Ingo Lohmar , James Nguyen , 27503@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jun 27 22:36:24 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPxDc-0004bE-Bi for geb-bug-gnu-emacs@m.gmane.org; Tue, 27 Jun 2017 22:36:16 +0200 Original-Received: from localhost ([::1]:58117 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dPxDh-0007as-IH for geb-bug-gnu-emacs@m.gmane.org; Tue, 27 Jun 2017 16:36:21 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dPxDU-0007Tg-8z for bug-gnu-emacs@gnu.org; Tue, 27 Jun 2017 16:36:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dPxDP-0006nJ-Ku for bug-gnu-emacs@gnu.org; Tue, 27 Jun 2017 16:36:08 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:38536) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dPxDP-0006n8-7R for bug-gnu-emacs@gnu.org; Tue, 27 Jun 2017 16:36:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dPxDP-00006D-1I for bug-gnu-emacs@gnu.org; Tue, 27 Jun 2017 16:36:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: James Nguyen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 27 Jun 2017 20:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27503 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 27503-submit@debbugs.gnu.org id=B27503.149859572432754 (code B ref 27503); Tue, 27 Jun 2017 20:36:02 +0000 Original-Received: (at 27503) by debbugs.gnu.org; 27 Jun 2017 20:35:24 +0000 Original-Received: from localhost ([127.0.0.1]:41205 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPxCl-0008WE-VP for submit@debbugs.gnu.org; Tue, 27 Jun 2017 16:35:24 -0400 Original-Received: from out1-smtp.messagingengine.com ([66.111.4.25]:41479) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPwNf-0007Ez-37 for 27503@debbugs.gnu.org; Tue, 27 Jun 2017 15:42:36 -0400 Original-Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 4D86922E44; Tue, 27 Jun 2017 15:42:34 -0400 (EDT) Original-Received: from web3 ([10.202.2.213]) by compute1.internal (MEProxy); Tue, 27 Jun 2017 15:42:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=f4z0vUoMxmafM7ApbXUlaVe/Hn4wK mwNeqfO2t4cyPo=; b=X8DxMYYNxFIoXf3gepj7aOsH728Mnf05u0Cs1S6U2mtk9 zSlmP15MO91ziIXtbjg0o5LGNUXE+FPbbcPI9pOv7kGR8dOi44gi9zH9Idbx0xaG pXDt+UX5OWktCDrZA4Ja239kurEWhNI6VZgDom56gcf0hY9GmGcXfypK1gE4bnzM GsfVfY3cYf5DblBqUDbNkTjpjm+2o/CPayUGu42XSCKhU3u7fQXxmnHDQXKMfyzx 9zwrMG9TbDXCC+cJ51cYAc3h2weWsEquRHARUM3fz5C6CjaQfj25YEEWG+t6j+mt b2KCNLXnoSCpG7Gc1NNSYpvYc36+VG26t4KQhBa6A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=f4z0vU oMxmafM7ApbXUlaVe/Hn4wKmwNeqfO2t4cyPo=; b=Fp1V0XHBGQqFFhLkEUN8c5 vhIUJMmpmfh8gPSrwBCU9QM1pAUpaFQ6cHZo6Cz2fwlWb8oFuSQpyRatWcoubT3B 7IHQ/Nf/+hOj7kRxSMPVJJXGtHAY9biHPkbPOmDnlXdN4b9207h5PBY1jftkm34T Bxdidysug167u58E8Iq4+9FKhdBGQN6nLjONGzByf0Wscy1UX3ejhfIxItLHvIDA C7YiUQ6rxblsqWdXUJ3xrNFDhs/r/dEeLExODvwZtzIJw5BhevbUZY5CIBGFr8U3 g4S6UPT4lqS8JpZakGaFITbnxYqrNvB/n0bo3cvZIYBrzc0TPjBjj2O14b32wzzg == X-ME-Sender: Original-Received: by mailuser.nyi.internal (Postfix, from userid 99) id 21E0D9EB8C; Tue, 27 Jun 2017 15:42:34 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface - ajax-07d9e719 In-Reply-To: <87fuel70up.fsf@acer.localhost.com> X-Mailman-Approved-At: Tue, 27 Jun 2017 16:35:22 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:133968 Archived-At: This would effectively be the same as my snippet right? I removed the if check and the else block to always go into the progn. This looks good to me unless there are other gotchas. Making it configurable is ideal. -- James Nguyen jamesn@fastmail.com On Tue, Jun 27, 2017, at 11:16 AM, Ingo Lohmar wrote: > I've been meaning to post this for months, guess now is as good a time > as any. Here's an alternative take that I've been using for a long time > without noticing any bugs. It is a less intrusive change to achieve the > desired effect AFAICT: > > > > diff --git i/lisp/progmodes/js.el w/lisp/progmodes/js.el > index bae9e52bf0..a27db82eb0 100644 > --- i/lisp/progmodes/js.el > +++ w/lisp/progmodes/js.el > @@ -475,6 +475,11 @@ js-flat-functions > :type 'boolean > :group 'js) > > +(defcustom js-cont-nonempty-list-indent-rigidly nil > + "Indent continuation of non-empty ([{ lines in `js-mode' rigidly." > + :type 'boolean > + :group 'js) > + > (defcustom js-comment-lineup-func #'c-lineup-C-comments > "Lineup function for `cc-mode-style', for C comments in `js-mode'." > :type 'function > @@ -2092,7 +2097,8 @@ js--proper-indentation > (switch-keyword-p (looking-at > "default\\_>\\|case\\_>[^:]")) > (continued-expr-p (js--continued-expression-p))) > (goto-char (nth 1 parse-status)) ; go to the opening char > - (if (looking-at "[({[]\\s-*\\(/[/*]\\|$\\)") > + (if (or js-cont-nonempty-list-indent-rigidly > + (looking-at "[({[]\\s-*\\(/[/*]\\|$\\)")) > (progn ; nothing following the opening paren/bracket > (skip-syntax-backward " ") > (when (eq (char-before) ?\)) (backward-list))