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#54702: 29.0.50; ruby-mode indentation: endless methods Date: Wed, 27 Apr 2022 05:44:36 +0300 Message-ID: <2136fe2e-85dd-8a3f-dc7b-ee7a8389dc76@yandex.ru> References: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="17737"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 To: Aaron Jensen , 54702@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Apr 27 04:45:30 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 1njXgI-0004UY-On for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 27 Apr 2022 04:45:30 +0200 Original-Received: from localhost ([::1]:60994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njXgH-0004O1-HO for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 26 Apr 2022 22:45:29 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:32978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njXfq-0004MM-Sr for bug-gnu-emacs@gnu.org; Tue, 26 Apr 2022 22:45:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:46958) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njXfq-000856-KJ for bug-gnu-emacs@gnu.org; Tue, 26 Apr 2022 22:45:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1njXfq-0000xv-Id for bug-gnu-emacs@gnu.org; Tue, 26 Apr 2022 22:45:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 27 Apr 2022 02:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54702 X-GNU-PR-Package: emacs Original-Received: via spool by 54702-submit@debbugs.gnu.org id=B54702.16510274883674 (code B ref 54702); Wed, 27 Apr 2022 02:45:02 +0000 Original-Received: (at 54702) by debbugs.gnu.org; 27 Apr 2022 02:44:48 +0000 Original-Received: from localhost ([127.0.0.1]:40855 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1njXfb-0000xB-P8 for submit@debbugs.gnu.org; Tue, 26 Apr 2022 22:44:47 -0400 Original-Received: from mail-wr1-f52.google.com ([209.85.221.52]:42790) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1njXfZ-0000wv-Ec for 54702@debbugs.gnu.org; Tue, 26 Apr 2022 22:44:45 -0400 Original-Received: by mail-wr1-f52.google.com with SMTP id e24so558339wrc.9 for <54702@debbugs.gnu.org>; Tue, 26 Apr 2022 19:44:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=z9DXAroYG6bEd7P8Sk2WdqGz/JCK4sJFy2fD5N1Y7c8=; b=ATcuCwlx4W/lisGGszKLUbk+8zCr7XtseAVp4NJ3jg4k6R7rHgTWI/bcfArOEX4Jf+ hOrCcBW9dubIJVbDU//kkVeyfiTONeFhM/cX9ZWHr71JBgWkKiMvWBDQhT/x+c5LvqXt e8q1PlL3WGhU3ibB62hxZWjPn17hc1cBL8nM/OwgLL3IH7YmQ1c9KEcBwQc3/dJw7211 R8UzLt1Hvp+w6wznhtHpPWlGkTLNlr7FLQeqXQxkZ2XGWAftBe0MYq87TKMIy3KFWiOQ 1qfSkey+/m9PVbvNtpJoUeShhNeqyNbs7mSRqYY3VvyZvy0rJs+yPR3N/DbgPN7fqHUO rC8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:message-id:date:mime-version:user-agent :subject:content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=z9DXAroYG6bEd7P8Sk2WdqGz/JCK4sJFy2fD5N1Y7c8=; b=UVVaRMXhS7FaTqu4z2fgYHCBiEVnHx57fmJKPc4ZXiLAQCbOzL2WF037htFRqkKnFX 4aB1tbtKeYJuLvUsUdHANGb7EHtNdQ2hTCh6LtlvKggIYKDLvTpBJhOO2aRCzm8U4G/y nEMJcgSfATA8cGtUxqouMhLtW7gSMOkLX2ese3vAng+mYKU5iWACHeQGzryDsTcK9XWc kbI7Gy8WY2WqQ/QlMTzblshTIf75nEO+jBN2ljEMb2uZJE3+A2PyAksgJTmisjtc2wrF eyogMiLJXK5+O0VgxA9Z5gQy9a7J9m75yx4z18QJQo7JaYDEwQWUqKPhmldw1H3aVvRW Op1A== X-Gm-Message-State: AOAM5338FBmlE29APMjrn9Y5vUZ8anoUT0PcGZwxC6JI5XRAem/2bRc3 O7x+MqqX+Q1a+9Ac0Pglrq8= X-Google-Smtp-Source: ABdhPJzQ/uH8YzKzX/r5kfTxf0TZdE3dL1vuDpFkscLeF0kTIEIRO74NB6MLmufWv1853s4aOMiulA== X-Received: by 2002:a5d:434e:0:b0:207:a48e:a99a with SMTP id u14-20020a5d434e000000b00207a48ea99amr20225238wrr.250.1651027479348; Tue, 26 Apr 2022 19:44:39 -0700 (PDT) Original-Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id a18-20020adffb92000000b00207a257d47asm12714163wrr.95.2022.04.26.19.44.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 26 Apr 2022 19:44:38 -0700 (PDT) Content-Language: en-US In-Reply-To: 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" Xref: news.gmane.io gmane.emacs.bugs:230760 Archived-At: Hi Aaron, On 04.04.2022 05:03, Aaron Jensen wrote: > > Ruby 3 and 3.1 bring us different versions of endless methods. They > currently don't indent correctly in `ruby-mode`: > > Current: > > ```rb > class Bar > def foo = bar > > def baz > end > end > ``` > > Expected: > > ```rb > class Bar > def foo = bar > > def baz > end > end > ``` Thanks for the report. I'll work on this further, but here's a quick-and-dirty patch to fix the indentation problems. diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index a197724634..3733603fb3 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -528,6 +528,9 @@ ruby-smie--forward-token (ruby-smie--forward-token)) ;Fully redundant. (t ";"))) ((equal tok "&.") ".") + ((and (equal tok "def") + (looking-at " *[a-zA-Z0-9_]* *\\(([^()]*)\\)? *=")) + "def=") (t tok))))))))) (defun ruby-smie--backward-token () @@ -575,6 +578,9 @@ ruby-smie--backward-token (ruby-smie--backward-token)) ;Fully redundant. (t ";"))) ((equal tok "&.") ".") + ((and (equal tok "def") + (looking-at "def *[a-zA-Z0-9_]* *\\(([^()]*)\\)? *=")) + "def=") (t tok))))))) (defun ruby-smie--indent-to-stmt ()