procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* progmodes/ruby-mode.el (ruby-move-to-block): Work with (maybe

Browse source 
temporarily) broken indentation.
* automated/ruby-mode-tests.el (ruby-block-test-example):
  Break indentation of the do block opener and add a line inside it.
* automated/ruby-mode-tests.el (works-on-do, ok-with-three):
  Adjust line numbers.
This commit is contained in:
Dmitry Gutov 2013-01-28 05:20:42 +04:00
parent b162502414
commit a324b8c791
4 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/ChangeLog
View file

@ -2,6 +2,8 @@
* progmodes/ruby-mode.el (ruby-font-lock-keywords): Remove some
checks made superfluous by the \_< operator.
* progmodes/ruby-mode.el (ruby-move-to-block): Work with (maybe
temporarily) broken indentation.
2013-01-27 Nobuyoshi Nakada <nobu@ruby-lang.org>

2
lisp/progmodes/ruby-mode.el
View file

@ -905,7 +905,7 @@ current block, a sibling block, or an outer block. Do that (abs N) times."
((and backward (looking-at "^=end\\>"))
(re-search-backward "^=begin\\>"))
(t
(setq pos (current-indentation))
(setq pos (ruby-calculate-indent))
(cond
;; Deeper indentation, we found a block.
;; FIXME: We can't recognize empty blocks this way.

4
test/ChangeLog
View file

@ -2,6 +2,10 @@
* automated/ruby-mode-tests.el
(ruby-indent-spread-args-in-parens): New test.
* automated/ruby-mode-tests.el (ruby-block-test-example):
Break indentation of the do block opener and add a line inside it.
* automated/ruby-mode-tests.el (works-on-do, ok-with-three):
Adjust line numbers.
2013-01-15 Stefan Monnier <monnier@iro.umontreal.ca>

7
test/automated/ruby-mode-tests.el
View file

@ -408,7 +408,8 @@ VALUES-PLIST is a list with alternating index and value elements."
| end
|
| def baz
| some do
|some do
|3
| end
| end
|end"))
@ -425,7 +426,7 @@ VALUES-PLIST is a list with alternating index and value elements."
(ruby-deftest-move-to-block works-on-do
(goto-line 11)
(ruby-end-of-block)
(should (= 12 (line-number-at-pos)))
(should (= 13 (line-number-at-pos)))
(ruby-beginning-of-block)
(should (= 11 (line-number-at-pos))))
@ -437,7 +438,7 @@ VALUES-PLIST is a list with alternating index and value elements."
(ruby-deftest-move-to-block ok-with-three
(goto-line 2)
(ruby-move-to-block 3)
(should (= 13 (line-number-at-pos))))
(should (= 14 (line-number-at-pos))))
(ruby-deftest-move-to-block ok-with-minus-two
(goto-line 10)