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

* lisp/progmodes/ruby-mode.el (ruby-parse-partial): Don't increase

Browse source 
depth for unfinished percent literal.  Not using it in the caller.
(ruby-move-to-block): Jump over multiline literals of all types,
ignoring code-looking contents inside them.

* test/automated/ruby-mode-tests.el
(ruby-move-to-block-skips-percent-literal): Add depth-affecting
bits inside the examples.
(ruby-move-to-block-skips-heredoc): New test.
This commit is contained in:
Dmitry Gutov 2013-02-14 07:33:55 +04:00
parent 6b26f14f78
commit 53ca88c478
4 changed files with 41 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,3 +1,10 @@
2013-02-14 Dmitry Gutov <dgutov@yandex.ru>
* progmodes/ruby-mode.el (ruby-parse-partial): Don't increase
depth for unfinished percent literal. Not using it in the caller.
(ruby-move-to-block): Jump over multiline literals of all types,
ignoring code-looking contents inside them.
2013-02-13 Michael Albinus <michael.albinus@gmx.de>
Use ControlMaster where applicable. (Bug#13677)

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

@ -519,12 +519,6 @@ Can be one of `heredoc', `modifier', `expr-qstr', `expr-re'."
(concat "[^\\]\\(\\\\\\\\\\)*" w))
end t)))
(setq in-string (point))
(when (eq (char-syntax (string-to-char w)) ?\()
;; The rest of the literal, when parsed separately, will
;; have the depth of -1. So in the rare case when this
;; number is used despite the in-string status, the
;; depths will balance.
(setq depth (1+ depth)))
(goto-char end)))
(t
(goto-char pnt))))
@ -913,10 +907,16 @@ current block, a sibling block, or an outer block. Do that (abs N) times."
(re-search-forward "^=end\\>"))
((and backward (looking-at "^=end\\>"))
(re-search-backward "^=begin\\>"))
;; Jump over a multiline literal.
((ruby-in-ppss-context-p 'string)
(goto-char (nth 8 (syntax-ppss)))
(unless backward
(forward-sexp)
(when (bolp) (forward-char -1)))) ; After a heredoc.
(t
(incf depth (or (nth 2 (ruby-parse-region (point)
(line-end-position)))
0))
(let ((state (ruby-parse-region (point) (line-end-position))))
(unless (car state) ; Line ends with unfinished string.
(setq depth (+ (nth 2 state) depth))))
(cond
;; Deeper indentation, we found a block.
;; FIXME: We can't recognize empty blocks this way.