From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Ingo Lohmar Newsgroups: gmane.emacs.bugs Subject: bug#27503: 26.0.50; Not lining up Javascript arguments Date: Tue, 27 Jun 2017 20:16:14 +0200 Message-ID: <87fuel70up.fsf@acer.localhost.com> References: <87FF3D96-DBCF-4EBD-8E72-3F796AB89FF1@fastmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1498587439 2068 195.159.176.226 (27 Jun 2017 18:17:19 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 27 Jun 2017 18:17:19 +0000 (UTC) Cc: james@jojojames.com To: 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 20:17:08 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 1dPv2y-0008Qz-9z for geb-bug-gnu-emacs@m.gmane.org; Tue, 27 Jun 2017 20:17:08 +0200 Original-Received: from localhost ([::1]:57644 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dPv33-0001R7-CZ for geb-bug-gnu-emacs@m.gmane.org; Tue, 27 Jun 2017 14:17:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55306) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dPv2w-0001R1-1Z for bug-gnu-emacs@gnu.org; Tue, 27 Jun 2017 14:17:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dPv2s-0004SR-QX for bug-gnu-emacs@gnu.org; Tue, 27 Jun 2017 14:17:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:38463) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dPv2s-0004SM-Me for bug-gnu-emacs@gnu.org; Tue, 27 Jun 2017 14:17:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dPv2s-0005IL-HG for bug-gnu-emacs@gnu.org; Tue, 27 Jun 2017 14:17:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Ingo Lohmar Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 27 Jun 2017 18:17: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.149858738420299 (code B ref 27503); Tue, 27 Jun 2017 18:17:02 +0000 Original-Received: (at 27503) by debbugs.gnu.org; 27 Jun 2017 18:16:24 +0000 Original-Received: from localhost ([127.0.0.1]:41140 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPv2F-0005HL-MJ for submit@debbugs.gnu.org; Tue, 27 Jun 2017 14:16:23 -0400 Original-Received: from mail-wm0-f67.google.com ([74.125.82.67]:32898) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPv2E-0005H8-2T for 27503@debbugs.gnu.org; Tue, 27 Jun 2017 14:16:22 -0400 Original-Received: by mail-wm0-f67.google.com with SMTP id j85so7297150wmj.0 for <27503@debbugs.gnu.org>; Tue, 27 Jun 2017 11:16:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=3N9lNyJ5Ntdoy+S4Z7NA5gj2oS/xps/1QxVXhFey/Js=; b=MF7wWuVqNnNGq/2LVroAmiDRtkbwj9xJBsH1D22+1voo57SB9CYwr7R3NG8RjsbbnV Tb0QjuVc9B6jjl8FA9wqBEwwhf+OuEl3LB4BVq3T5/WEf0JhnUDBgfelodM1T0I5C+Ox GSkhnPHqFVMXNBERUeett9eVtJsvoMvYzQeboSRGyQusyAxg1gkQZEwaxHoceSssP39i t1guKw0AQ2nGTSVrqfN7PhrsRa0zhOLHNLjSMguPqjE/Bn0C2hebPWjd1AbcOkCIrw1k AzKd06PmcfBh5XgZcP8W2XYaOho8Jh0yKbcS0X2BhNj8EYbFvXJI3nNXKjWilK4VBHol OeWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=3N9lNyJ5Ntdoy+S4Z7NA5gj2oS/xps/1QxVXhFey/Js=; b=Bu1cYgm9dvKP5uax8AaX3LFhyKgVsxahBsNp00fGUhfWqhz0WCuqpa9D1MTWH8vjCx +vebju9vU7M0ZJP9LWMeJJE2YoZLRmgPBdUVN9hCh7/rx/j4mhIyqhZvZdYPRiRu76GT A5+nYqons0pCjX9AP5GDNJk0LDM/5ajxG//9NWWQwild1M8xRnOF5fW7M8s1CJ6r9d+d djucI5p+zeFzCsLw2hw1ukn0E7ykOJBoOpkNmPnoh8XEsct0joP4n219OuDTB8QUSOQJ 0g9Xgr295CUECmm35qF4E4b91KZ7PbVs5wdIv8VBFlnQl4PiOYL7kYJOYVt6k0B1nHRs CmaA== X-Gm-Message-State: AKS2vOzhnhTyG2H0LT15UXJ95lV5tbgpLwprNEiURFSKX/jPAufgUBIA 1oXegMo5X/EO+w== X-Received: by 10.80.165.229 with SMTP id b34mr4772714edc.29.1498587376288; Tue, 27 Jun 2017 11:16:16 -0700 (PDT) Original-Received: from localhost (xdsl-213-168-118-85.netcologne.de. [213.168.118.85]) by smtp.gmail.com with ESMTPSA id l4sm1706231edb.35.2017.06.27.11.16.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Jun 2017 11:16:15 -0700 (PDT) In-Reply-To: <87FF3D96-DBCF-4EBD-8E72-3F796AB89FF1@fastmail.com> 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:133965 Archived-At: 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))