GNU bug report logs - #61822
29.0.60; Ruby indentation with assignment and method calls

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 61822 in the body.
You can then email your comments to 61822 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Aaron Jensen <aaronjensen <at> gmail.com>
To: bug-gnu-emacs <at> gnu.org
Cc: dgutov <at> yandex.ru
Subject: 29.0.60; Ruby indentation with assignment and method calls
Date: Sun, 26 Feb 2023 13:43:44 -0500

I don't recall if this was a case we talked about, but this does not
indent as I would expect/hope with ruby-mode and this set:

(setq ruby-block-indent nil
      ruby-method-call-indent nil
      ruby-method-params-indent nil
      ruby-after-operator-indent nil)

Actual:

some_variable = some_method(
    some_argument
  )

Expected:

some_variable = some_method(
  some_argument
)

Message #8 received at 61822 <at> debbugs.gnu.org (full text, mbox):

From: Dmitry Gutov <dgutov <at> yandex.ru>
To: Aaron Jensen <aaronjensen <at> gmail.com>, 61822 <at> debbugs.gnu.org
Subject: Re: bug#61822: 29.0.60; Ruby indentation with assignment and method
 calls
Date: Mon, 27 Feb 2023 00:18:22 +0200

Hi!

On 26/02/2023 20:43, Aaron Jensen wrote:
> 
> I don't recall if this was a case we talked about, but this does not
> indent as I would expect/hope with ruby-mode and this set:
> 
> (setq ruby-block-indent nil
>        ruby-method-call-indent nil
>        ruby-method-params-indent nil
>        ruby-after-operator-indent nil)
> 
> Actual:
> 
> some_variable = some_method(
>      some_argument
>    )
> 
> Expected:
> 
> some_variable = some_method(
>    some_argument
> )

Somehow, we've never tested this one. On the higher level, it might 
actually be consistent, similar to the following:

  foo + bar(
      asdasd
    )

So the fix would depend on how you want them to behave.

Does the patch below work okay for you?

BTW, ruby-ts-mode handles these cases well already, I think.

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index dba9ff0a846..6778507bc2b 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -908,7 +908,8 @@ ruby-smie-rules
                      "+=" "-=" "*=" "/=" "%=" "**=" "&=" "|=" "^=" "|"
                      "<<=" ">>=" "&&=" "||=" "and" "or"))
      (cond
-      ((not ruby-after-operator-indent)
+      ((and (not ruby-after-operator-indent)
+            (smie-indent--hanging-p))
        (ruby-smie--indent-to-stmt ruby-indent-level))
       ((and (smie-rule-parent-p ";" nil)
             (smie-indent--hanging-p))

Message #11 received at 61822 <at> debbugs.gnu.org (full text, mbox):

From: Aaron Jensen <aaronjensen <at> gmail.com>
To: Dmitry Gutov <dgutov <at> yandex.ru>
Cc: 61822 <at> debbugs.gnu.org
Subject: Re: bug#61822: 29.0.60;
 Ruby indentation with assignment and method calls
Date: Sun, 26 Feb 2023 17:57:27 -0500

On Sun, Feb 26, 2023 at 5:18 PM Dmitry Gutov <dgutov <at> yandex.ru> wrote:
>
> Hi!
>
> On 26/02/2023 20:43, Aaron Jensen wrote:
> >
> > I don't recall if this was a case we talked about, but this does not
> > indent as I would expect/hope with ruby-mode and this set:
> >
> > (setq ruby-block-indent nil
> >        ruby-method-call-indent nil
> >        ruby-method-params-indent nil
> >        ruby-after-operator-indent nil)
> >
> > Actual:
> >
> > some_variable = some_method(
> >      some_argument
> >    )
> >
> > Expected:
> >
> > some_variable = some_method(
> >    some_argument
> > )
>
> Somehow, we've never tested this one. On the higher level, it might
> actually be consistent, similar to the following:
>
>    foo + bar(
>        asdasd
>      )
>
> So the fix would depend on how you want them to behave.
>
> Does the patch below work okay for you?
>
> BTW, ruby-ts-mode handles these cases well already, I think.
>
> diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
> index dba9ff0a846..6778507bc2b 100644
> --- a/lisp/progmodes/ruby-mode.el
> +++ b/lisp/progmodes/ruby-mode.el
> @@ -908,7 +908,8 @@ ruby-smie-rules
>                        "+=" "-=" "*=" "/=" "%=" "**=" "&=" "|=" "^=" "|"
>                        "<<=" ">>=" "&&=" "||=" "and" "or"))
>        (cond
> -      ((not ruby-after-operator-indent)
> +      ((and (not ruby-after-operator-indent)
> +            (smie-indent--hanging-p))
>          (ruby-smie--indent-to-stmt ruby-indent-level))
>         ((and (smie-rule-parent-p ";" nil)
>               (smie-indent--hanging-p))
>

This seems to work for me. I'm good with this being the same too as it
is with your patch:

foo + bar(
  asdasd
)

Thank you!

Message #14 received at 61822 <at> debbugs.gnu.org (full text, mbox):

From: Dmitry Gutov <dgutov <at> yandex.ru>
To: Aaron Jensen <aaronjensen <at> gmail.com>
Cc: 61822 <at> debbugs.gnu.org
Subject: Re: bug#61822: 29.0.60; Ruby indentation with assignment and method
 calls
Date: Mon, 27 Feb 2023 01:57:00 +0200

On 27/02/2023 00:57, Aaron Jensen wrote:
>> diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
>> index dba9ff0a846..6778507bc2b 100644
>> --- a/lisp/progmodes/ruby-mode.el
>> +++ b/lisp/progmodes/ruby-mode.el
>> @@ -908,7 +908,8 @@ ruby-smie-rules
>>                         "+=" "-=" "*=" "/=" "%=" "**=" "&=" "|=" "^=" "|"
>>                         "<<=" ">>=" "&&=" "||=" "and" "or"))
>>         (cond
>> -      ((not ruby-after-operator-indent)
>> +      ((and (not ruby-after-operator-indent)
>> +            (smie-indent--hanging-p))
>>           (ruby-smie--indent-to-stmt ruby-indent-level))
>>          ((and (smie-rule-parent-p ";" nil)
>>                (smie-indent--hanging-p))
>>
> This seems to work for me. I'm good with this being the same too as it
> is with your patch:
> 
> foo + bar(
>    asdasd
> )

Hmm, that one seems to misindent this example:

  some_variable = abc + some_method(
                    some_argument
                  )

How about this patch?

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index dba9ff0a846..559b62fef54 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -909,7 +909,9 @@ ruby-smie-rules
                      "<<=" ">>=" "&&=" "||=" "and" "or"))
      (cond
       ((not ruby-after-operator-indent)
-       (ruby-smie--indent-to-stmt ruby-indent-level))
+       (ruby-smie--indent-to-stmt (if (smie-indent--hanging-p)
+                                      ruby-indent-level
+                                    0)))
       ((and (smie-rule-parent-p ";" nil)
             (smie-indent--hanging-p))
        ruby-indent-level)))

Message #17 received at 61822 <at> debbugs.gnu.org (full text, mbox):

From: Aaron Jensen <aaronjensen <at> gmail.com>
To: Dmitry Gutov <dgutov <at> yandex.ru>
Cc: 61822 <at> debbugs.gnu.org
Subject: Re: bug#61822: 29.0.60;
 Ruby indentation with assignment and method calls
Date: Sun, 26 Feb 2023 18:59:37 -0500

On Sun, Feb 26, 2023 at 6:57 PM Dmitry Gutov <dgutov <at> yandex.ru> wrote:
>
> On 27/02/2023 00:57, Aaron Jensen wrote:
> >> diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
> >> index dba9ff0a846..6778507bc2b 100644
> >> --- a/lisp/progmodes/ruby-mode.el
> >> +++ b/lisp/progmodes/ruby-mode.el
> >> @@ -908,7 +908,8 @@ ruby-smie-rules
> >>                         "+=" "-=" "*=" "/=" "%=" "**=" "&=" "|=" "^=" "|"
> >>                         "<<=" ">>=" "&&=" "||=" "and" "or"))
> >>         (cond
> >> -      ((not ruby-after-operator-indent)
> >> +      ((and (not ruby-after-operator-indent)
> >> +            (smie-indent--hanging-p))
> >>           (ruby-smie--indent-to-stmt ruby-indent-level))
> >>          ((and (smie-rule-parent-p ";" nil)
> >>                (smie-indent--hanging-p))
> >>
> > This seems to work for me. I'm good with this being the same too as it
> > is with your patch:
> >
> > foo + bar(
> >    asdasd
> > )
>
> Hmm, that one seems to misindent this example:
>
>    some_variable = abc + some_method(
>                      some_argument
>                    )
>
> How about this patch?
>
> diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
> index dba9ff0a846..559b62fef54 100644
> --- a/lisp/progmodes/ruby-mode.el
> +++ b/lisp/progmodes/ruby-mode.el
> @@ -909,7 +909,9 @@ ruby-smie-rules
>                        "<<=" ">>=" "&&=" "||=" "and" "or"))
>        (cond
>         ((not ruby-after-operator-indent)
> -       (ruby-smie--indent-to-stmt ruby-indent-level))
> +       (ruby-smie--indent-to-stmt (if (smie-indent--hanging-p)
> +                                      ruby-indent-level
> +                                    0)))
>         ((and (smie-rule-parent-p ";" nil)
>               (smie-indent--hanging-p))
>          ruby-indent-level)))
>

Nice catch. This patch looks good to me.

Aaron

Message #22 received at 61822-done <at> debbugs.gnu.org (full text, mbox):

From: Dmitry Gutov <dgutov <at> yandex.ru>
To: Aaron Jensen <aaronjensen <at> gmail.com>
Cc: 61822-done <at> debbugs.gnu.org
Subject: Re: bug#61822: 29.0.60; Ruby indentation with assignment and method
 calls
Date: Mon, 27 Feb 2023 02:10:55 +0200

On 27/02/2023 01:59, Aaron Jensen wrote:
> On Sun, Feb 26, 2023 at 6:57 PM Dmitry Gutov<dgutov <at> yandex.ru>  wrote:
>> On 27/02/2023 00:57, Aaron Jensen wrote:
>>>> diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
>>>> index dba9ff0a846..6778507bc2b 100644
>>>> --- a/lisp/progmodes/ruby-mode.el
>>>> +++ b/lisp/progmodes/ruby-mode.el
>>>> @@ -908,7 +908,8 @@ ruby-smie-rules
>>>>                          "+=" "-=" "*=" "/=" "%=" "**=" "&=" "|=" "^=" "|"
>>>>                          "<<=" ">>=" "&&=" "||=" "and" "or"))
>>>>          (cond
>>>> -      ((not ruby-after-operator-indent)
>>>> +      ((and (not ruby-after-operator-indent)
>>>> +            (smie-indent--hanging-p))
>>>>            (ruby-smie--indent-to-stmt ruby-indent-level))
>>>>           ((and (smie-rule-parent-p ";" nil)
>>>>                 (smie-indent--hanging-p))
>>>>
>>> This seems to work for me. I'm good with this being the same too as it
>>> is with your patch:
>>>
>>> foo + bar(
>>>     asdasd
>>> )
>> Hmm, that one seems to misindent this example:
>>
>>     some_variable = abc + some_method(
>>                       some_argument
>>                     )
>>
>> How about this patch?
>>
>> diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
>> index dba9ff0a846..559b62fef54 100644
>> --- a/lisp/progmodes/ruby-mode.el
>> +++ b/lisp/progmodes/ruby-mode.el
>> @@ -909,7 +909,9 @@ ruby-smie-rules
>>                         "<<=" ">>=" "&&=" "||=" "and" "or"))
>>         (cond
>>          ((not ruby-after-operator-indent)
>> -       (ruby-smie--indent-to-stmt ruby-indent-level))
>> +       (ruby-smie--indent-to-stmt (if (smie-indent--hanging-p)
>> +                                      ruby-indent-level
>> +                                    0)))
>>          ((and (smie-rule-parent-p ";" nil)
>>                (smie-indent--hanging-p))
>>           ruby-indent-level)))
>>
> Nice catch. This patch looks good to me.

Thanks for testing, pushed to emacs-29.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.