From: Dmitry Gutov Date: Sat, 22 Aug 2020 13:21:50 +0000 (+0300) Subject: Make ruby-parse-partial more stable X-Git-Tag: emacs-28.0.90~6463 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2725254ab5463124388b1278e1cf0fdfafa0ba96;p=emacs.git Make ruby-parse-partial more stable * lisp/progmodes/ruby-mode.el (ruby-parse-partial): Don't call ruby-deep-indent-paren-p (bug#42841). --- diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index e16225c7fa9..831acf87bf0 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -1060,22 +1060,12 @@ delimiter." (goto-char (point)) ) ((looking-at "[\\[{(]") - (let ((deep (ruby-deep-indent-paren-p (char-after)))) - (if (and deep (or (not (eq (char-after) ?\{)) (ruby-expr-beg))) - (progn - (and (eq deep 'space) (looking-at ".\\s +[^# \t\n]") - (setq pnt (1- (match-end 0)))) - (setq nest (cons (cons (char-after (point)) pnt) nest)) - (setq pcol (cons (cons pnt depth) pcol)) - (setq depth 0)) - (setq nest (cons (cons (char-after (point)) pnt) nest)) - (setq depth (1+ depth)))) + (setq nest (cons (cons (char-after (point)) pnt) nest)) + (setq depth (1+ depth)) (goto-char pnt) ) ((looking-at "[])}]") - (if (ruby-deep-indent-paren-p (matching-paren (char-after))) - (setq depth (cdr (car pcol)) pcol (cdr pcol)) - (setq depth (1- depth))) + (setq depth (1- depth)) (setq nest (cdr nest)) (goto-char pnt)) ((looking-at ruby-block-end-re)