From: Dmitry Gutov <dgutov@yandex.ru>
Date: Wed, 20 Jan 2016 21:26:05 +0000 (+0300)
Subject: Support squiggly heredocs in ruby-mode
X-Git-Tag: emacs-25.0.90~102
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6a9399f7fd3ea6f4eaa0c6ceee92308553fadd39;p=emacs.git

Support squiggly heredocs in ruby-mode

* lisp/progmodes/ruby-mode.el (ruby-here-doc-beg-re):
Support squiggly heredocs added in Ruby 2.3.

* test/indent/ruby.rb: Add squiggly example.
---

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 53f8a6bb4c0..e3fe315f3bd 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -102,7 +102,7 @@
 
 (eval-and-compile
   (defconst ruby-here-doc-beg-re
-  "\\(<\\)<\\(-\\)?\\(\\([a-zA-Z0-9_]+\\)\\|[\"]\\([^\"]+\\)[\"]\\|[']\\([^']+\\)[']\\)"
+  "\\(<\\)<\\([~-]\\)?\\(\\([a-zA-Z0-9_]+\\)\\|[\"]\\([^\"]+\\)[\"]\\|[']\\([^']+\\)[']\\)"
   "Regexp to match the beginning of a heredoc.")
 
   (defconst ruby-expression-expansion-re
diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb
index dec6de98605..dfd1c75a679 100644
--- a/test/indent/ruby.rb
+++ b/test/indent/ruby.rb
@@ -4,6 +4,10 @@ if something_wrong?             # ruby-move-to-block-skips-heredoc
   end
   eowarn
   foo
+
+  foo(<<~squiggly)
+  end
+  squiggly
 end
 
 def foo