Commit 8619323f authored by Dmitry Gutov's avatar Dmitry Gutov
Browse files

* lisp/progmodes/ruby-mode.el (ruby-expr-beg): Make heredoc detection

more strict.  Add docstring.

* test/automated/ruby-mode-tests.el (ruby-indent-singleton-class): Pass.
(ruby-indent-inside-heredoc-after-operator)
(ruby-indent-inside-heredoc-after-space): New tests.
parent f360feb8
2012-11-14 Dmitry Gutov <dgutov@yandex.ru>
* progmodes/ruby-mode.el (ruby-expr-beg): Make heredoc detection
more strict. Add docstring.
2012-11-14 Stefan Monnier <monnier@iro.umontreal.ca>
 
* emacs-lisp/gv.el (setf): Fix debug spec for multiple assignments
......
......@@ -384,7 +384,9 @@ and `\\' when preceded by `?'."
(looking-at "class\\s *<<"))))
(defun ruby-expr-beg (&optional option)
"TODO: document."
"Check if point is possibly at the beginning of an expression.
OPTION specifies the type of the expression.
Can be one of `heredoc', `modifier', `expr-qstr', `expr-re'."
(save-excursion
(store-match-data nil)
(let ((space (skip-chars-backward " \t"))
......@@ -397,10 +399,10 @@ and `\\' when preceded by `?'."
(or (eq (char-syntax (char-before (point))) ?w)
(ruby-special-char-p))))
nil)
((and (eq option 'heredoc) (< space 0))
(not (progn (goto-char start) (ruby-singleton-class-p))))
((or (looking-at ruby-operator-re)
(looking-at "[\\[({,;]")
((looking-at ruby-operator-re))
((eq option 'heredoc)
(and (< space 0) (not (ruby-singleton-class-p start))))
((or (looking-at "[\\[({,;]")
(and (looking-at "[!?]")
(or (not (eq option 'modifier))
(bolp)
......
2012-11-14 Dmitry Gutov <dgutov@yandex.ru>
* automated/ruby-mode-tests.el (ruby-indent-singleton-class): Pass.
(ruby-indent-inside-heredoc-after-operator)
(ruby-indent-inside-heredoc-after-space): New tests.
2012-11-13 Dmitry Gutov <dgutov@yandex.ru>
* automated/ruby-mode-tests.el (ruby-heredoc-font-lock)
......
......@@ -154,7 +154,6 @@ VALUES-PLIST is a list with alternating index and value elements."
|"))
(ert-deftest ruby-indent-singleton-class ()
:expected-result :failed ; Doesn't work yet, when no space before "<<".
(ruby-should-indent-buffer
"class<<bar
| foo
......@@ -165,6 +164,20 @@ VALUES-PLIST is a list with alternating index and value elements."
| end
|"))
(ert-deftest ruby-indent-inside-heredoc-after-operator ()
(ruby-should-indent-buffer
"b=<<eos
| 42"
"b=<<eos
| 42"))
(ert-deftest ruby-indent-inside-heredoc-after-space ()
(ruby-should-indent-buffer
"foo <<eos.gsub(' ', '*')
| 42"
"foo <<eos.gsub(' ', '*')
| 42"))
(ert-deftest ruby-indent-array-literal ()
(let ((ruby-deep-indent-paren nil))
(ruby-should-indent-buffer
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment