diff options
| author | Dmitry Gutov | 2013-11-12 16:15:14 +0200 |
|---|---|---|
| committer | Dmitry Gutov | 2013-11-12 16:15:14 +0200 |
| commit | 7b08f97e71cea0fde24d9a81a8ca2e8366ff110f (patch) | |
| tree | 8d05f1209ecbce9291d8c86951a2519f4aadbc9e /test | |
| parent | 9b1ee27c6c88619f32fdbc4e5be7c745763c3b65 (diff) | |
| download | emacs-7b08f97e71cea0fde24d9a81a8ca2e8366ff110f.tar.gz emacs-7b08f97e71cea0fde24d9a81a8ca2e8366ff110f.zip | |
* lisp/progmodes/ruby-mode.el (ruby-smie-grammar): Disambiguate between
binary "|" operator and closing block args delimiter. Remove
FIXME comment referring to Ruby 1.8-only syntax.
(ruby-smie--implicit-semi-p): Not after "|" operator.
(ruby-smie--closing-pipe-p): New function.
(ruby-smie--forward-token, ruby-smie--backward-token): Use it.
(ruby-smie-rules): Indent after "|".
Diffstat (limited to 'test')
| -rw-r--r-- | test/indent/ruby.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb index 1d2eb08db94..a3ab73bcfb5 100644 --- a/test/indent/ruby.rb +++ b/test/indent/ruby.rb | |||
| @@ -285,6 +285,9 @@ bar 1 do | |||
| 285 | end | 285 | end |
| 286 | end | 286 | end |
| 287 | 287 | ||
| 288 | foo | | ||
| 289 | bar | ||
| 290 | |||
| 288 | foo || | 291 | foo || |
| 289 | begin | 292 | begin |
| 290 | bar | 293 | bar |