bug#15914: 24.3; ruby-toggle-block fails when the block holds a string interpolation

bug#15914: 24.3; ruby-toggle-block fails when the block holds a string interpolation

[Adam Sokolnicki]

[-- Attachment #1: Type: text/plain, Size: 615 bytes --]

Way to reproduce it:

M-x find-file tmp.rb RET
M-x ruby-mode RET
foo do\n  "#{bar}"\nend
M-x ruby-toggle-block RET

I've attached a diff that should fix it.

In GNU Emacs 24.3.1 (x86_64-apple-darwin12.5.0, NS apple-appkit-1187.39)
 of 2013-11-07 on Adam-Sokolnickis-MacBook-Pro.local
Windowing system distributor `Apple', version 10.3.1187
Configured using:
 `configure '--prefix=/usr/local/Cellar/emacs/24.3' '--without-dbus'
 '--enable-locallisppath=/usr/local/share/emacs/site-lisp'
 '--infodir=/usr/local/Cellar/emacs/24.3/share/info/emacs'
 '--without-gnutls' '--with-ns' '--disable-ns-self-contained' 'CC=cc''

[-- Attachment #2: ruby-toggle-block.diff --]
[-- Type: application/octet-stream, Size: 600 bytes --]

--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -1590,8 +1590,9 @@ If the result is do-end block, it will always be multiline."
   (let ((start (point)) beg end)
     (end-of-line)
     (unless
-        (if (and (re-search-backward "\\({\\)\\|\\_<do\\(\\s \\|$\\||\\)")
+        (if (and (re-search-backward "\\(?:[^#]\\)\\({\\)\\|\\(\\_<do\\_>\\)")
                  (progn
+		   (goto-char (or (match-beginning 1) (match-beginning 2)))
                    (setq beg (point))
                    (save-match-data (ruby-forward-sexp))
                    (setq end (point))
-- 

bug#15914: 24.3; ruby-toggle-block fails when the block holds a string interpolation

[Dmitry Gutov]

Version: 24.4

Adam Sokolnicki <adam.sokolnicki@gmail.com> writes:
> I've attached a diff that should fix it.

Applied, thanks!

bug#15914: 24.3; ruby-toggle-block fails when the block holds a string interpolation

[Dmitry Gutov]

Sorry, forgot to close it.