From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Jackson Ray Hamilton Newsgroups: gmane.emacs.bugs Subject: bug#25904: Patches Date: Sun, 10 Feb 2019 14:03:44 -0800 (PST) Message-ID: <1195338258.64458.1549836224184@privateemail.com> References: Reply-To: Jackson Ray Hamilton Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_64456_814158368.1549836224176" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="59479"; mail-complaints-to="usenet@blaine.gmane.org" To: 25904@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Feb 10 23:04:19 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1gsxD0-000FLr-0a for geb-bug-gnu-emacs@m.gmane.org; Sun, 10 Feb 2019 23:04:18 +0100 Original-Received: from localhost ([127.0.0.1]:37204 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gsxCy-0001Ze-UB for geb-bug-gnu-emacs@m.gmane.org; Sun, 10 Feb 2019 17:04:16 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:58341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gsxCn-0001X0-8L for bug-gnu-emacs@gnu.org; Sun, 10 Feb 2019 17:04:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gsxCk-0004UA-2l for bug-gnu-emacs@gnu.org; Sun, 10 Feb 2019 17:04:05 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:43621) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gsxCj-0004Tt-Rs for bug-gnu-emacs@gnu.org; Sun, 10 Feb 2019 17:04:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gsxCj-0000fQ-IR for bug-gnu-emacs@gnu.org; Sun, 10 Feb 2019 17:04:01 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: Resent-From: Jackson Ray Hamilton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 10 Feb 2019 22:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25904 X-GNU-PR-Package: emacs Original-Received: via spool by 25904-submit@debbugs.gnu.org id=B25904.15498362322549 (code B ref 25904); Sun, 10 Feb 2019 22:04:01 +0000 Original-Received: (at 25904) by debbugs.gnu.org; 10 Feb 2019 22:03:52 +0000 Original-Received: from localhost ([127.0.0.1]:42902 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gsxCa-0000f2-9K for submit@debbugs.gnu.org; Sun, 10 Feb 2019 17:03:52 -0500 Original-Received: from mta-06-3.privateemail.com ([198.54.127.59]:12952) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gsxCY-0000eo-7p for 25904@debbugs.gnu.org; Sun, 10 Feb 2019 17:03:51 -0500 Original-Received: from MTA-06.privateemail.com (localhost [127.0.0.1]) by MTA-06.privateemail.com (Postfix) with ESMTP id 4813E6003D for <25904@debbugs.gnu.org>; Sun, 10 Feb 2019 17:03:44 -0500 (EST) Original-Received: from APP-06 (unknown [10.20.147.156]) by MTA-06.privateemail.com (Postfix) with ESMTPA id 31D1560039 for <25904@debbugs.gnu.org>; Sun, 10 Feb 2019 22:03:44 +0000 (UTC) X-Priority: 3 Importance: Medium X-Mailer: Open-Xchange Mailer v7.8.1-Rev36 X-Originating-Client: open-xchange-appsuite X-Virus-Scanned: ClamAV using ClamSMTP 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: 209.51.188.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:155347 Archived-At: ------=_Part_64456_814158368.1549836224176 Content-Type: multipart/alternative; boundary="----=_Part_64457_797999058.1549836224176" ------=_Part_64457_797999058.1549836224176 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hello Dmitry and Felipe, I=E2=80=99ve taken a stab at formatting Felipe=E2=80=99s fix for arrow func= tion indentation according to the coding standards. Compared to his patch,= I made some trivial name/doc changes, and changed (progn (forward-char) (js--looking-at-broken-arrow-function-p)) to (save-excursion (forward-char) (js--looking-at-broken-arrow-function-p)) since we probably want to undo the forward-char in case the form returns ni= l. In order to get all the JS indentation tests to pass with make, I also had = to make a variable safe file-locally. Both changes are attached. They could be applied to the emacs-26 branch. = (Or master, but emacs-26 would be preferable so we can deliver it sooner. = I tested on both branches.) Jackson ------=_Part_64457_797999058.1549836224176 MIME-Version: 1.0 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit

Hello Dmitry and Felipe,

I’ve taken a stab at formatting Felipe’s fix for arrow function indentation according to the coding standards.  Compared to his patch, I made some trivial name/doc changes, and changed

(progn (forward-char) (js--looking-at-broken-arrow-function-p))

to

(save-excursion (forward-char) (js--looking-at-broken-arrow-function-p))

since we probably want to undo the forward-char in case the form returns nil.

In order to get all the JS indentation tests to pass with make, I also had to make a variable safe file-locally.

Both changes are attached.  They could be applied to the emacs-26 branch.  (Or master, but emacs-26 would be preferable so we ca n deliver it sooner.  I tested on both branches.)

Jackson

------=_Part_64457_797999058.1549836224176-- ------=_Part_64456_814158368.1549836224176 Content-Type: text/x-patch; charset=UTF-8; name=0001-Indent-arrows-expression-bodies-like-function-bodies.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-Indent-arrows-expression-bodies-like-function-bodies.patch X-Part-Id: 90a2d78cfa684e7daf7dd29a91ec56bf RnJvbSAzODNhNmFhMTNmOTAzNDZiNDg5YmM0YjhmOTAwZmU3NjdhNzI1YjkwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYWNrc29uIFJheSBIYW1pbHRvbiA8amFja3NvbkBqYWNrc29u cmF5aGFtaWx0b24uY29tPgpEYXRlOiBTYXQsIDkgRmViIDIwMTkgMTI6MjY6MjEgLTA4MDAKU3Vi amVjdDogW1BBVENIXSA9P1VURi04P3E/SW5kZW50PTIwYXJyb3dzPUUyPTgwPTk5PTIwZXhwcmVz c2lvbj0yMGJvZGllcz89CiA9P1VURi04P3E/PTIwbGlrZT0yMGZ1bmN0aW9uPTIwYm9kaWVzPTIw KEJ1ZyMyNTkwNCk/PQpNSU1FLVZlcnNpb246IDEuMApDb250ZW50LVR5cGU6IHRleHQvcGxhaW47 IGNoYXJzZXQ9VVRGLTgKQ29udGVudC1UcmFuc2Zlci1FbmNvZGluZzogOGJpdAoKKiBsaXNwL3By b2dtb2Rlcy9qcy5lbCAoanMtLWNvbnRpbnVlZC1leHByZXNzaW9uLXApOiBEb27igJl0IGNvbmZ1 c2UK4oCYPT7igJkgZm9yIGEg4oCYPuKAmSBvcGVyYXRvci4KKGpzLS1saW5lLXRlcm1pbmF0aW5n LWFycm93LXJlKTogTmV3IHZhcmlhYmxlLgooanMtLWxvb2tpbmctYXQtYnJva2VuLWFycm93LWZ1 bmN0aW9uLXApOiBOZXcgZnVuY3Rpb24uCihqcy0tcHJvcGVyLWluZGVudGF0aW9uKTogRG9u4oCZ dCBhbGlnbiBhcnJvdyBmdW5jdGlvbnPigJkgZXhwcmVzc2lvbgpib2RpZXMgc3RhcnRpbmcgb24g bmV3IGxpbmVzIGxpa2UgbGlzdCBjb250aW51YXRpb25zLCBpbnN0ZWFkIGFsaWduCnRoZW0gbGlr ZSBmdW5jdGlvbiBib2RpZXMgKGpzLWluZGVudC1hbGlnbi1saXN0LWNvbnRpbnVhdGlvbiBuZWVk IG5vdApiZSBuaWwpLgoKKiB0ZXN0L21hbnVhbC9pbmRlbnQvanMuanM6IEFkZCB0ZXN0IGZvciBC dWcjMjU5MDQuCgpDby1hdXRob3JlZC1ieTogRmVsaXBlIE9jaG9hIDxmZWxpcGVAZm92LnNwYWNl PgotLS0KIGxpc3AvcHJvZ21vZGVzL2pzLmVsICAgICB8IDIzICsrKysrKysrKysrKysrKysrKysr Ky0tCiB0ZXN0L21hbnVhbC9pbmRlbnQvanMuanMgfCAgOSArKysrKysrKysKIDIgZmlsZXMgY2hh bmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNw L3Byb2dtb2Rlcy9qcy5lbCBiL2xpc3AvcHJvZ21vZGVzL2pzLmVsCmluZGV4IDY1ZmZiMGUwMmYu Ljc4N2FmYjRlMTAgMTAwNjQ0Ci0tLSBhL2xpc3AvcHJvZ21vZGVzL2pzLmVsCisrKyBiL2xpc3Av cHJvZ21vZGVzL2pzLmVsCkBAIC0xODQ5LDcgKzE4NDksNyBAQCBqcy0tY29udGludWVkLWV4cHJl c3Npb24tcAogICAgICAgICAgICAgIChza2lwLWNoYXJzLWJhY2t3YXJkICIgXHQiKQogICAgICAg ICAgICAgIChvciAoYm9icCkgKGJhY2t3YXJkLWNoYXIpKQogICAgICAgICAgICAgIChhbmQgKD4g KHBvaW50KSAocG9pbnQtbWluKSkKLSAgICAgICAgICAgICAgICAgIChzYXZlLWV4Y3Vyc2lvbiAo YmFja3dhcmQtY2hhcikgKG5vdCAobG9va2luZy1hdCAiWy8qXS8iKSkpCisgICAgICAgICAgICAg ICAgICAoc2F2ZS1leGN1cnNpb24gKGJhY2t3YXJkLWNoYXIpIChub3QgKGxvb2tpbmctYXQgIlsv Kl0vXFx8PT4iKSkpCiAgICAgICAgICAgICAgICAgICAoanMtLWxvb2tpbmctYXQtb3BlcmF0b3It cCkKICAgICAgICAgICAgICAgICAgIChhbmQgKHByb2duIChiYWNrd2FyZC1jaGFyKQogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKG5vdCAobG9va2luZy1hdCAiK1xcK1xcfC0tXFx8L1sv Kl0iKSkpKSkpKSkpKQpAQCAtMjA3OCw2ICsyMDc4LDI0IEBAIGpzLS1tYXliZS1nb3RvLWRlY2xh cmF0aW9uLWtleXdvcmQtZW5kCiAgICAgICAgICh3aGVuIGNvbW1hLXAKICAgICAgICAgICAoZ290 by1jaGFyICgxKyBkZWNsYXJhdGlvbi1rZXl3b3JkLWVuZCkpKSkpKSkpCiAKKyhkZWZjb25zdCBq cy0tbGluZS10ZXJtaW5hdGluZy1hcnJvdy1yZSAiXFxzLSo9Plxccy0qXFwoL1svKl1cXHwkXFwp IgorICAiUmVnZXhwIG1hdGNoaW5nIHRoZSBsYXN0IFwiPT5cIiAoYXJyb3cpIHRva2VuIG9uIGEg bGluZS4KK1doaXRlc3BhY2UgYW5kIGNvbW1lbnRzIGFyb3VuZCB0aGUgYXJyb3cgYXJlIGlnbm9y ZWQuIikKKworKGRlZnVuIGpzLS1sb29raW5nLWF0LWJyb2tlbi1hcnJvdy1mdW5jdGlvbi1wICgp CisgICJIZWxwZXIgZnVuY3Rpb24gZm9yIGBqcy0tcHJvcGVyLWluZGVudGF0aW9uJy4KK1JldHVy biB0IGlmIHBvaW50IGlzIGF0IHRoZSBzdGFydCBvZiBhIChwb3NzaWJseSBhc3luYykgYXJyb3cK K2Z1bmN0aW9uIGFuZCB0aGUgbGFzdCBub24tY29tbWVudCwgbm9uLXdoaXRlc3BhY2UgdG9rZW4g b2YgdGhlCitjdXJyZW50IGxpbmUgaXMgdGhlIFwiPT5cIiB0b2tlbi4iCisgICh3aGVuIChsb29r aW5nLWF0ICJcXHMtKmFzeW5jXFxzLSoiKQorICAgIChnb3RvLWNoYXIgKG1hdGNoLWVuZCAwKSkp CisgIChjb25kCisgICAoKGVxIChjaGFyLWFmdGVyKSA/XCgpCisgICAgKGZvcndhcmQtbGlzdCkK KyAgICAobG9va2luZy1hdC1wIGpzLS1saW5lLXRlcm1pbmF0aW5nLWFycm93LXJlKSkKKyAgICh0 IChsb29raW5nLWF0LXAKKyAgICAgICAoY29uY2F0IGpzLS1uYW1lLXJlIGpzLS1saW5lLXRlcm1p bmF0aW5nLWFycm93LXJlKSkpKSkKKwogKGRlZnVuIGpzLS1wcm9wZXItaW5kZW50YXRpb24gKHBh cnNlLXN0YXR1cykKICAgIlJldHVybiB0aGUgcHJvcGVyIGluZGVudGF0aW9uIGZvciB0aGUgY3Vy cmVudCBsaW5lLiIKICAgKHNhdmUtZXhjdXJzaW9uCkBAIC0yMTA4LDcgKzIxMjYsOCBAQCBqcy0t cHJvcGVyLWluZGVudGF0aW9uCiAgICAgICAgICAgICAgICAgIChjb250aW51ZWQtZXhwci1wIChq cy0tY29udGludWVkLWV4cHJlc3Npb24tcCkpKQogICAgICAgICAgICAgIChnb3RvLWNoYXIgKG50 aCAxIHBhcnNlLXN0YXR1cykpIDsgZ28gdG8gdGhlIG9wZW5pbmcgY2hhcgogICAgICAgICAgICAg IChpZiAob3IgKG5vdCBqcy1pbmRlbnQtYWxpZ24tbGlzdC1jb250aW51YXRpb24pCi0gICAgICAg ICAgICAgICAgICAgICAobG9va2luZy1hdCAiWyh7W11cXHMtKlxcKC9bLypdXFx8JFxcKSIpKQor ICAgICAgICAgICAgICAgICAgICAgKGxvb2tpbmctYXQgIlsoe1tdXFxzLSpcXCgvWy8qXVxcfCRc XCkiKQorICAgICAgICAgICAgICAgICAgICAgKHNhdmUtZXhjdXJzaW9uIChmb3J3YXJkLWNoYXIp IChqcy0tbG9va2luZy1hdC1icm9rZW4tYXJyb3ctZnVuY3Rpb24tcCkpKQogICAgICAgICAgICAg ICAgICAocHJvZ24gOyBub3RoaW5nIGZvbGxvd2luZyB0aGUgb3BlbmluZyBwYXJlbi9icmFja2V0 CiAgICAgICAgICAgICAgICAgICAgKHNraXAtc3ludGF4LWJhY2t3YXJkICIgIikKICAgICAgICAg ICAgICAgICAgICAod2hlbiAoZXEgKGNoYXItYmVmb3JlKSA/XCkpIChiYWNrd2FyZC1saXN0KSkK ZGlmZiAtLWdpdCBhL3Rlc3QvbWFudWFsL2luZGVudC9qcy5qcyBiL3Rlc3QvbWFudWFsL2luZGVu dC9qcy5qcwppbmRleCBiMGQ4YmNhYmQyLi5mYzM5YzEyMjQ0IDEwMDY0NAotLS0gYS90ZXN0L21h bnVhbC9pbmRlbnQvanMuanMKKysrIGIvdGVzdC9tYW51YWwvaW5kZW50L2pzLmpzCkBAIC0xNDQs NiArMTQ0LDE1IEBAIGJhcigKICAgL2FiYy8KICkKIAorLy8gYnVnIzI1OTA0Citmb28uYmFyLmJh eih2ZXJ5ID0+IC8vIEEgY29tbWVudAorICB2ZXJ5CispLmJpeigoW2Jhej17YTogWzEyM119LCBi b3pdKSA9PgorICBiYXoKKykuc25hcmYoKHNub3JmKSA9PiAvKiBBbm90aGVyIGNvbW1lbnQgKi8K KyAgc25vcmYKKyk7CisKIC8vIExvY2FsIFZhcmlhYmxlczoKIC8vIGluZGVudC10YWJzLW1vZGU6 IG5pbAogLy8ganMtaW5kZW50LWxldmVsOiAyCi0tIAoyLjExLjAKCg== ------=_Part_64456_814158368.1549836224176 Content-Type: text/x-patch; charset=ISO-8859-1; name=0001-js-indent-align-list-continuation-Make-variable-safe.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-js-indent-align-list-continuation-Make-variable-safe.patch X-Part-Id: 9b9ff441bad1427a807d5d47e07daffd RnJvbSA5MThmODczZDFkNzAyZDRlMjMzNTM3NDdiOTdiNzcwMDRkZDczOGRlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYWNrc29uIFJheSBIYW1pbHRvbiA8amFja3NvbkBqYWNrc29u cmF5aGFtaWx0b24uY29tPgpEYXRlOiBTYXQsIDkgRmViIDIwMTkgMTE6NTA6MDUgLTA4MDAKU3Vi amVjdDogW1BBVENIXSBqcy1pbmRlbnQtYWxpZ24tbGlzdC1jb250aW51YXRpb246IE1ha2UgdmFy aWFibGUgc2FmZQoKKiBsaXNwL3Byb2dtb2Rlcy9qcy5lbCAoanMtaW5kZW50LWFsaWduLWxpc3Qt Y29udGludWF0aW9uKTogSW5kaWNhdGUKdmFyaWFibGUgaXMgc2FmZSBhcyBhIGZpbGUtbG9jYWwg dmFyaWFibGUuICBUaGlzIGZpeGVzIHRoZQpqcy1pbmRlbnQtYWxpZ24tbGlzdC1jb250aW51YXRp b24tbmlsIHRlc3Qgd2hlbiBydW4gd2l0aCBtYWtlLgotLS0KIGxpc3AvcHJvZ21vZGVzL2pzLmVs IHwgMSArCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKykKCmRpZmYgLS1naXQgYS9saXNw L3Byb2dtb2Rlcy9qcy5lbCBiL2xpc3AvcHJvZ21vZGVzL2pzLmVsCmluZGV4IGE5NGEyZmUxMzQu LjZlMThlMzA1MTcgMTAwNjQ0Ci0tLSBhL2xpc3AvcHJvZ21vZGVzL2pzLmVsCisrKyBiL2xpc3Av cHJvZ21vZGVzL2pzLmVsCkBAIC00NzcsNiArNDc3LDcgQEAganMtaW5kZW50LWFsaWduLWxpc3Qt Y29udGludWF0aW9uCiAgICJBbGlnbiBjb250aW51YXRpb24gb2Ygbm9uLWVtcHR5IChbeyBsaW5l cyBpbiBganMtbW9kZScuIgogICA6dmVyc2lvbiAiMjYuMSIKICAgOnR5cGUgJ2Jvb2xlYW4KKyAg OnNhZmUgJ2Jvb2xlYW5wCiAgIDpncm91cCAnanMpCiAKIChkZWZjdXN0b20ganMtY29tbWVudC1s aW5ldXAtZnVuYyAjJ2MtbGluZXVwLUMtY29tbWVudHMKLS0gCjIuMTEuMAoK ------=_Part_64456_814158368.1549836224176--