[Emacs-diffs] emacs-25 0403620 1/2: Don't misindent arguments of a method call inside continuation

[Dmitry Gutov]

branch: emacs-25
commit 040362001d66fd721d3a85cddfadf8041cc23f7f
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    Don't misindent arguments of a method call inside continuation
    
    * lisp/progmodes/ruby-mode.el (ruby-smie-rules):
    Use smie-indent-virtual instead of smie-rule-parent (bug#23015).
    Simplify the traversal loop.
---
 lisp/progmodes/ruby-mode.el |   20 +++++++-------------
 test/indent/ruby.rb         |   11 +++++++++++
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 1c9f0f4..35d0cc4 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -629,19 +629,13 @@ It is used when `ruby-encoding-magic-comment-style' is 
set to `custom'."
         ;; because when `.' is inside the line, the
         ;; additional indentation from it looks out of place.
         ((smie-rule-parent-p ".")
-         (let (smie--parent)
-           (save-excursion
-             ;; Traverse up the parents until the parent is "." at
-             ;; indentation, or any other token.
-             (while (and (let ((parent (smie-indent--parent)))
-                           (goto-char (cadr parent))
-                           (save-excursion
-                             (unless (integerp (car parent)) (forward-char -1))
-                             (not (ruby-smie--bosp))))
-                         (progn
-                           (setq smie--parent nil)
-                           (smie-rule-parent-p "."))))
-             (smie-rule-parent))))
+         ;; Traverse up the call chain until the parent is not `.',
+         ;; or `.' at indentation, or at eol.
+         (while (and (not (ruby-smie--bosp))
+                     (equal (nth 2 (smie-backward-sexp ".")) ".")
+                     (not (ruby-smie--bosp)))
+           (forward-char -1))
+         (smie-indent-virtual))
         (t (smie-rule-parent))))))
     (`(:after . ,(or `"(" "[" "{"))
      ;; FIXME: Shouldn't this be the default behavior of
diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb
index 6ab814a..6793bfd 100644
--- a/test/indent/ruby.rb
+++ b/test/indent/ruby.rb
@@ -405,6 +405,17 @@ zoo
 a.records().map(&:b).zip(
   foo)
 
+foo1 =
+  subject.update(
+    1
+  )
+
+foo2 =
+  subject.
+    update(
+      2
+    )
+
 # FIXME: This is not consistent with the example below it, but this
 # offset only happens if the colon is at eol, which wouldn't be often.
 # Tokenizing `bar:' as `:bar =>' would be better, but it's hard to