From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#60186: 29.0.60; ruby-mode indentation of multi-line expressions Date: Tue, 20 Dec 2022 19:31:31 +0200 Message-ID: References: <4e44df18-207c-c7ca-0588-7285f3008dfb@yandex.ru> <358bbd65-9375-04c8-f0a2-24a4383f142e@yandex.ru> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------JOp91UaEMV0oISngnIhm7pP3" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="35218"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Cc: 60186@debbugs.gnu.org To: Aaron Jensen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Dec 20 19:38:46 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1p7hVj-0008ts-0A for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 20 Dec 2022 19:38:43 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7gTH-0001je-72; Tue, 20 Dec 2022 12:32:07 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p7gTD-0001jS-2c for bug-gnu-emacs@gnu.org; Tue, 20 Dec 2022 12:32:04 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p7gTC-00067Z-2X for bug-gnu-emacs@gnu.org; Tue, 20 Dec 2022 12:32:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7gTB-0001A3-Rg for bug-gnu-emacs@gnu.org; Tue, 20 Dec 2022 12:32:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 20 Dec 2022 17:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60186 X-GNU-PR-Package: emacs Original-Received: via spool by 60186-submit@debbugs.gnu.org id=B60186.16715575004452 (code B ref 60186); Tue, 20 Dec 2022 17:32:01 +0000 Original-Received: (at 60186) by debbugs.gnu.org; 20 Dec 2022 17:31:40 +0000 Original-Received: from localhost ([127.0.0.1]:46158 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7gSq-00019k-Ez for submit@debbugs.gnu.org; Tue, 20 Dec 2022 12:31:40 -0500 Original-Received: from mail-wr1-f42.google.com ([209.85.221.42]:37637) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7gSp-00019e-8t for 60186@debbugs.gnu.org; Tue, 20 Dec 2022 12:31:39 -0500 Original-Received: by mail-wr1-f42.google.com with SMTP id co23so12461341wrb.4 for <60186@debbugs.gnu.org>; Tue, 20 Dec 2022 09:31:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:references:cc:to:from:content-language:subject :user-agent:mime-version:date:message-id:sender:from:to:cc:subject :date:message-id:reply-to; bh=0NH3XYZH5yEdHp5OSLlVDr/FX84jIxXr1hB/nau7CX8=; b=lmpgkHObPXoVIMbxqYXmc8GlYZVBWfy5omUBK1duFxcqkf/xF64F3WvBux+U0QH4Wc QAVC50PGonJji6wT1+2d9ENKzhv2xIWCrg7EnpVZAB7DX2VHXkNwie7KMThohyrh9Kwt KiG1RjwKC54CLNtzD6951erT7ZhRNSyeZ9GGhtX1gHEiwqhgrkwpbdcBcXoC7HcDpWAT UAjFmSQZT18D4Ll1rFs/m7L6Go6zZaLpga/W9ttevB9iA4HFi4/OmR53Pi1fQVbxQwFR IGC+pJ7HznHtC80XnhOc/ndBfh04JZeiz58+nRiDgczJN4vKh6kCVYugAMOuyhAspxrZ D+0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:references:cc:to:from:content-language:subject :user-agent:mime-version:date:message-id:sender:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=0NH3XYZH5yEdHp5OSLlVDr/FX84jIxXr1hB/nau7CX8=; b=VKHOnkgo3dRlV24IiE1HsyXj6JuAndIijRCzjGNBC9aCHwNDJQ/Dr2N7IpaN+BOiYX ghuYYWXtywg3MBmLnjYPmlZnq2K20/1JYrOPJdj9rQsQKe05rsiWCCoX3CNbA3msz8Qb jv6PU3Zok4J/4EnPNZH3Sdh/Lhli8tvMt5FIgvwLtIbJUtAWiFxIDEmfVYNWTuudYIGy R+JH6F1SYj5bAJUOjEWamIUFPb6cWkt7/sbIHfPLHUbAd4fr/vC/XFSFxaMuk/cTszHz P+iL2MXlKRVxRrE7spphWckO9ZoCdOXOLL5TBHpaCKsV/n9DWCTRIfONxx8/WzeeVc9m 7qlQ== X-Gm-Message-State: ANoB5pnBguaz8acALn2ZRRbowOCcsrjWOyvPnSr97SkvOezEnsmBWTMB 6akzxx2RhtyHvk3CjWARRV4= X-Google-Smtp-Source: AA0mqf6jr784vx5CwhSfxzOzcBA/gu1mrufrg7AuKXNNOf+rHdxjGRyZyMC52gvLzGN0MnSlZFfZvg== X-Received: by 2002:adf:f292:0:b0:242:7279:a56b with SMTP id k18-20020adff292000000b002427279a56bmr29692029wro.56.1671557493466; Tue, 20 Dec 2022 09:31:33 -0800 (PST) Original-Received: from [192.168.0.2] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id y18-20020a5d4ad2000000b002365cd93d05sm13313012wrs.102.2022.12.20.09.31.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 20 Dec 2022 09:31:32 -0800 (PST) Content-Language: en-US In-Reply-To: <358bbd65-9375-04c8-f0a2-24a4383f142e@yandex.ru> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:251535 Archived-At: This is a multi-part message in MIME format. --------------JOp91UaEMV0oISngnIhm7pP3 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 20/12/2022 18:19, Dmitry Gutov wrote: > Okay, so there should be two basic cases: > > - Indent to the beginning of the statement, > - If there was a line continuation (no matter how many), indent 1 extra > level? Here's another quick attempt to make this work without rewriting the rest of the logic. Cases 1 and 2 seem to work now, but not the block example. --------------JOp91UaEMV0oISngnIhm7pP3 Content-Type: text/x-patch; charset=UTF-8; name="ruby-simplified-indent-v2.diff" Content-Disposition: attachment; filename="ruby-simplified-indent-v2.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL3J1YnktbW9kZS5lbCBiL2xpc3AvcHJvZ21v ZGVzL3J1YnktbW9kZS5lbAppbmRleCAxZjNlOWI2YWU3Yi4uMDJkMmUwYTJhNzUgMTAwNjQ0 Ci0tLSBhL2xpc3AvcHJvZ21vZGVzL3J1YnktbW9kZS5lbAorKysgYi9saXNwL3Byb2dtb2Rl cy9ydWJ5LW1vZGUuZWwKQEAgLTI4NSw2ICsyODUsMTEgQEAgcnVieS1tZXRob2QtcGFyYW1z LWluZGVudAogICA6c2FmZSAobGFtYmRhICh2YWwpIChvciAobWVtcSB2YWwgJyh0IG5pbCkp IChudW1iZXJwIHZhbCkpKQogICA6dmVyc2lvbiAiMjkuMSIpCiAKKyhkZWZjdXN0b20gcnVi eS1pbmRlbnQtc2ltcGxpZmllZCB0CisgICJGb28gYmFyLiIKKyAgOnR5cGUgJ2Jvb2xlYW4K KyAgOnNhZmUgJ2Jvb2xlYW5wKQorCiAoZGVmY3VzdG9tIHJ1YnktZGVlcC1hcmdsaXN0IHQK ICAgIkRlZXAgaW5kZW50IGxpc3RzIGluIHBhcmVudGhlc2lzIHdoZW4gbm9uLW5pbC4KIEFs c28gaWdub3JlcyBzcGFjZXMgYWZ0ZXIgcGFyZW50aGVzaXMgd2hlbiBgc3BhY2UnLgpAQCAt NjA4LDE1ICs2MTMsMjAgQEAgcnVieS1zbWllLS1iYWNrd2FyZC10b2tlbgogICAgICAgICAg ICJkZWY9IikKICAgICAgICAgICh0IHRvaykpKSkpKSkKIAotKGRlZnVuIHJ1Ynktc21pZS0t aW5kZW50LXRvLXN0bXQgKCkKKyhkZWZ1biBydWJ5LXNtaWUtLWluZGVudC10by1zdG10ICgm b3B0aW9uYWwgb2Zmc2V0KQogICAoc2F2ZS1leGN1cnNpb24KICAgICAoc21pZS1iYWNrd2Fy ZC1zZXhwICI7IikKLSAgICAoY29ucyAnY29sdW1uIChzbWllLWluZGVudC12aXJ0dWFsKSkp KQorICAgIChjb25zICdjb2x1bW4gKCsgKHNtaWUtaW5kZW50LXZpcnR1YWwpIChvciBvZmZz ZXQgMCkpKSkpCiAKIChkZWZ1biBydWJ5LXNtaWUtLWluZGVudC10by1zdG10LXAgKGtleXdv cmQpCiAgIChvciAoZXEgdCBydWJ5LWFsaWduLXRvLXN0bXQta2V5d29yZHMpCiAgICAgICAo bWVtcSAoaW50ZXJuIGtleXdvcmQpIHJ1YnktYWxpZ24tdG8tc3RtdC1rZXl3b3JkcykpKQog CisoZGVmY29uc3QgcnVieS1zbWllLS1vcGVyYXRvcnMgJygiPSIgIisiICItIiAiKiIgIi8i ICImJiIgInx8IiAiJSIgIioqIiAiXiIgIiYiCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAiPD0+IiAiPiIgIjwiICI+PSIgIjw9IiAiPT0iICI9PT0iICIhPSIgIjw8IiAi Pj4iCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiKz0iICItPSIgIio9IiAi Lz0iICIlPSIgIioqPSIgIiY9IiAifD0iICJePSIgInwiCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAiPDw9IiAiPj49IiAiJiY9IiAifHw9IiAiYW5kIiAib3IiKSkKKwog KGRlZnVuIHJ1Ynktc21pZS1ydWxlcyAoa2luZCB0b2tlbikKICAgKHBjYXNlIChjb25zIGtp bmQgdG9rZW4pCiAgICAgKCcoOmVsZW0gLiBiYXNpYykgcnVieS1pbmRlbnQtbGV2ZWwpCkBA IC02ODQsNiArNjk0LDE0IEBAIHJ1Ynktc21pZS1ydWxlcwogICAgICAgICAgICAoY29ucyAn Y29sdW1uIChjdXJyZW50LWNvbHVtbikpKQogICAgICAgIChzbWllLXJ1bGUtcGFyZW50IChv ciBydWJ5LW1ldGhvZC1wYXJhbXMtaW5kZW50IDApKSkpCiAgICAgKCcoOmJlZm9yZSAuICJk byIpIChydWJ5LXNtaWUtLWluZGVudC10by1zdG10KSkKKyAgICAoYCg6YWZ0ZXIgLiAsKHBy ZWQgKGxhbWJkYSAodG9rZW4pCisgICAgICAgICAgICAgICAgICAgICAgICAgKGFuZCBydWJ5 LWluZGVudC1zaW1wbGlmaWVkCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAob3IK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoZXF1YWwgdG9rZW4gIi4iKQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIChtZW1iZXIgdG9rZW4gcnVieS1zbWllLS1v cGVyYXRvcnMpKSkpKSkKKyAgICAgKGlmIChzbWllLWluZGVudC0taGFuZ2luZy1wKQorICAg ICAgICAgKHJ1Ynktc21pZS0taW5kZW50LXRvLXN0bXQgcnVieS1pbmRlbnQtbGV2ZWwpCisg ICAgICAgKHJ1Ynktc21pZS0taW5kZW50LXRvLXN0bXQpKSkKICAgICAoJyg6YmVmb3JlIC4g Ii4iKQogICAgICAoaWYgKHNtaWUtcnVsZS1zaWJsaW5nLXApCiAgICAgICAgICAod2hlbiBy dWJ5LWFsaWduLWNoYWluZWQtY2FsbHMKQEAgLTY5NSw5ICs3MTMsMTEgQEAgcnVieS1zbWll LXJ1bGVzCiAgICAgICAgICAgICAgICAgICAgKGdvdG8tY2hhciAobnRoIDEgcGFyZW50KSkK ICAgICAgICAgICAgICAgICAgICAobm90IChzbWllLXJ1bGUtYm9scCkpKSkpCiAgICAgICAg ICAgIChjb25zICdjb2x1bW4gKGN1cnJlbnQtY29sdW1uKSkpCi0gICAgICAgKHNtaWUtYmFj a3dhcmQtc2V4cCAiLiIpCi0gICAgICAgKGNvbnMgJ2NvbHVtbiAoKyAoY3VycmVudC1jb2x1 bW4pCi0gICAgICAgICAgICAgICAgICAgICAgICBydWJ5LWluZGVudC1sZXZlbCkpKSkKKyAg ICAgICAoaWYgcnVieS1pbmRlbnQtc2ltcGxpZmllZAorICAgICAgICAgICAocnVieS1zbWll LS1pbmRlbnQtdG8tc3RtdCBydWJ5LWluZGVudC1sZXZlbCkKKyAgICAgICAgIChzbWllLWJh Y2t3YXJkLXNleHAgIi4iKQorICAgICAgICAgKGNvbnMgJ2NvbHVtbiAoKyAoY3VycmVudC1j b2x1bW4pCisgICAgICAgICAgICAgICAgICAgICAgICAgIHJ1YnktaW5kZW50LWxldmVsKSkp KSkKICAgICAoYCg6YmVmb3JlIC4gLChvciAiZWxzZSIgInRoZW4iICJlbHNpZiIgInJlc2N1 ZSIgImVuc3VyZSIpKQogICAgICAoc21pZS1ydWxlLXBhcmVudCkpCiAgICAgKGAoOmJlZm9y ZSAuICwob3IgIndoZW4iICJpbiIpKQo= --------------JOp91UaEMV0oISngnIhm7pP3--