* lisp/progmodes/ruby-mode.el (ruby-smie-rules): Dedent `ensure'

keyword, too.

* test/indent/ruby.rb: Fix a syntax error, add a few failing examples.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24011e3584cd357efa0c54c06c9023830e632034..5a496908af778ee855e66bf40eac6b1751943773 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-06  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * progmodes/ruby-mode.el (ruby-smie-rules): Dedent `ensure'
+       keyword, too.
+
 2013-10-05  Dmitry Gutov  <dgutov@yandex.ru>
 
        * newcomment.el (comment-use-global-state): Change default value

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 662cef82259b3c72cf535dd40badbbaeaf280f1f..c1f79eb87110a1d28b2b996066765606f5e518dd 100644 (file)
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -381,7 +381,7 @@ Also ignores spaces after parenthesis when 'space."
                                     (looking-at comment-start-skip)))))
        ;; `(column . ,(smie-indent-virtual))
        (smie-rule-parent)))
-    (`(:before . ,(or `"else" `"then" `"elsif" `"rescue")) 0)
+    (`(:before . ,(or `"else" `"then" `"elsif" `"rescue" `"ensure")) 0)
     (`(:before . ,(or `"when"))
      (if (not (smie-rule-sibling-p)) 0)) ;; ruby-indent-level
     ;; Hack attack: Since newlines are separators, don't try to align args that

diff --git a/test/ChangeLog b/test/ChangeLog
index ac98b1c304065ec9851448c6dd5d623a27896364..bc9addb810b7651d64032fe99132efad856efc0b 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-06  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * indent/ruby.rb: Fix a syntax error, add a few failing examples.
+
 2013-10-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * indent/ruby.rb: Port a few cases from automated/ruby-mode-tests.el.

diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb
index 15315bcf65383735c6d638625ce935bba5688000..d52f4a3e6f6387e784722718d7fd7c49e9ac5ec8 100644 (file)
--- a/test/indent/ruby.rb
+++ b/test/indent/ruby.rb
@@ -37,7 +37,7 @@ foo = [1,                       # ruby-deep-indent
        2]
 
 foo = {                         # ruby-deep-indent-disabled
-  a : b
+  a: b
 }
 
 foo = [                         # ruby-deep-indent-disabled
@@ -99,6 +99,27 @@ if something == :==
   do_something
 end
 
+begin
+  foo
+ensure
+  bar
+end
+
+# Examples below fail with SMIE.
+
 # Bug#15369
 MSG = 'Separate every 3 digits in the integer portion of a number' \
       'with underscores(_).'
+
+# Next two fail similarly to the one above, so maybe remove 1 or 2
+# after they're fixed:
+
+a = foo(j, k) -
+  bar_tee
+
+while a < b do # "do" is optional
+  foo
+end
+
+desc "foo foo" \
+  "bar bar"