GNU bug report logs - #61871
29.0.60; ruby-mode indentation with destructuring assignment

Previous Next

Full log

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

From: Dmitry Gutov <dgutov <at> yandex.ru>
To: Aaron Jensen <aaronjensen <at> gmail.com>, 61871 <at> debbugs.gnu.org
Subject: Re: bug#61871: 29.0.60; ruby-mode indentation with destructuring
 assignment
Date: Tue, 28 Feb 2023 20:37:19 +0200

Hi!

On 28/02/2023 18:17, Aaron Jensen wrote:
> I found another edge case:
> 
> foo, bar = baz.(
>         some_arg
>       )
> 
> Should indent to:
> 
> foo, bar = baz.(
>    some_arg
> )

Thanks for that. This one is caused by implicit syntax which it 
non-trivial for SMIE to handle. ruby-ts-mode, predictably, indents it fine.

Please try this patch out:

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 559b62fef54..beccb8182a7 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -916,11 +916,14 @@ ruby-smie-rules
             (smie-indent--hanging-p))
        ruby-indent-level)))
     (`(:before . "=")
-     (save-excursion
-      (and (smie-rule-parent-p " @ ")
-           (goto-char (nth 1 (smie-indent--parent)))
-           (smie-rule-prev-p "def=")
-           (cons 'column (+ (current-column) ruby-indent-level -3)))))
+     (or
+      (save-excursion
+        (and (smie-rule-parent-p " @ ")
+             (goto-char (nth 1 (smie-indent--parent)))
+             (smie-rule-prev-p "def=")
+             (cons 'column (+ (current-column) ruby-indent-level -3))))
+      (and (smie-rule-parent-p ",")
+           (smie-rule-parent))))
     (`(:after . ,(or "?" ":"))
      (if ruby-after-operator-indent
          ruby-indent-level

Previous Next

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