[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#61822: 29.0.60; Ruby indentation with assignment and method calls
From: |
Aaron Jensen |
Subject: |
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@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!