diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-02 07:51:36 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-02 07:51:36 +0000 |
| commit | 20ff9c0a5c2a2b1c05564ff611e626ea2e913376 (patch) | |
| tree | b116f1df3014c73b3d51b496a2abaa7dddf1f36e | |
| parent | 023866716874462b36a2d5b29643d88afba222fa (diff) | |
| download | ruby-20ff9c0a5c2a2b1c05564ff611e626ea2e913376.tar.gz | |
ruby-mode.el: squiggly heredoc
* misc/ruby-mode.el (ruby-here-doc-beg-re),
(ruby-here-doc-beg-match, ruby-parse-partial): Support for
`squiggly heredoc' syntax in ruby-mode. [Fix GH-1372]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | misc/ruby-mode.el | 8 |
2 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Thu Jun 2 16:51:35 2016 Koichi ITO <koic.ito@gmail.com> + + * misc/ruby-mode.el (ruby-here-doc-beg-re), + (ruby-here-doc-beg-match, ruby-parse-partial): Support for + `squiggly heredoc' syntax in ruby-mode. [Fix GH-1372] + Thu Jun 2 10:24:48 2016 Martin Duerst <duerst@it.aoyama.ac.jp> * string.c: Raise ArgumentError when invalid string is detected in diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el index 77371cf30f..b1abd18a9e 100644 --- a/misc/ruby-mode.el +++ b/misc/ruby-mode.el @@ -107,7 +107,7 @@ (defconst ruby-block-end-re "\\_<end\\_>") (defconst ruby-here-doc-beg-re - "\\(<\\)<\\(-\\)?\\(\\([a-zA-Z0-9_]+\\)\\|[\"]\\([^\"]+\\)[\"]\\|[']\\([^']+\\)[']\\)") + "\\(<\\)<\\([-~]\\)?\\(\\([a-zA-Z0-9_]+\\)\\|[\"]\\([^\"]+\\)[\"]\\|[']\\([^']+\\)[']\\)") (defconst ruby-here-doc-end-re "^\\([ \t]+\\)?\\(.*\\)\\(.\\)$") @@ -127,9 +127,9 @@ (concat "<<" (let ((match (match-string 1))) (if (and match (> (length match) 0)) - (concat "\\(?:-\\([\"']?\\)\\|\\([\"']\\)" (match-string 1) "\\)" + (concat "\\(?:[-~]\\([\"']?\\)\\|\\([\"']\\)" (match-string 1) "\\)" contents "\\(\\1\\|\\2\\)") - (concat "-?\\([\"']\\|\\)" contents "\\1")))))) + (concat "[-~]?\\([\"']\\|\\)" contents "\\1")))))) (defconst ruby-delimiter (concat "[?$/%(){}#\"'`.:]\\|<<\\|\\[\\|\\]\\|\\_<\\(" @@ -679,7 +679,7 @@ Emacs to Ruby." ((looking-at "<<") (cond ((and (ruby-expr-beg 'heredoc) - (looking-at "<<\\(-\\)?\\(\\([\"'`]\\)\\([^\n]+?\\)\\3\\|\\(?:\\sw\\|\\s_\\)+\\)")) + (looking-at "<<\\([-~]\\)?\\(\\([\"'`]\\)\\([^\n]+?\\)\\3\\|\\(?:\\sw\\|\\s_\\)+\\)")) (setq re (regexp-quote (or (match-string 4) (match-string 2)))) (if (match-beginning 1) (setq re (concat "\\s *" re))) (let* ((id-end (goto-char (match-end 0))) |