[Emacs-diffs] trunk r115605: * lisp/progmodes/ruby-mode.el (ruby-smie-rules): Indent middle-of-block

[Dmitry Gutov]

------------------------------------------------------------
revno: 115605
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Gutov <address@hidden>
branch nick: trunk
timestamp: Thu 2013-12-19 07:06:24 +0200
message:
  * lisp/progmodes/ruby-mode.el (ruby-smie-rules): Indent middle-of-block
  keywords to their parent.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/ruby-mode.el    
rubymode.el-20091113204419-o5vbwnq5f7feedwu-8804
  test/indent/ruby.rb            ruby.rb-20120424165921-h044139hbrd7snvw-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-19 04:21:44 +0000
+++ b/lisp/ChangeLog    2013-12-19 05:06:24 +0000
@@ -1,5 +1,10 @@
 2013-12-19  Dmitry Gutov  <address@hidden>
 
+       * progmodes/ruby-mode.el (ruby-smie-rules): Indent middle-of-block
+       keywords to their parent.
+
+2013-12-19  Dmitry Gutov  <address@hidden>
+
        * progmodes/ruby-mode.el (ruby-smie--args-separator-p): Allow the
        first arg to be a string (fixed dead code), or an operator symbol.
        (ruby-smie--forward-token): Tokenize ` @ ' before strings and

=== modified file 'lisp/progmodes/ruby-mode.el'
--- a/lisp/progmodes/ruby-mode.el       2013-12-19 04:21:44 +0000
+++ b/lisp/progmodes/ruby-mode.el       2013-12-19 05:06:24 +0000
@@ -569,8 +569,9 @@
          (cons 'column (current-column)))))
     (`(:before . "do") (ruby-smie--indent-to-stmt))
     (`(:before . ".") ruby-indent-level)
-    (`(:before . ,(or `"else" `"then" `"elsif" `"rescue" `"ensure")) 0)
-    (`(:before . ,(or `"when"))
+    (`(:before . ,(or `"else" `"then" `"elsif" `"rescue" `"ensure"))
+     (smie-rule-parent))
+    (`(:before . "when")
      (if (not (smie-rule-sibling-p)) 0)) ;; ruby-indent-level
     (`(:after . ,(or "=" "iuwu-mod" "+" "-" "*" "/" "&&" "||" "%" "**" "^" "&"
                      "<=>" ">" "<" ">=" "<=" "==" "===" "!=" "<<" ">>"

=== modified file 'test/indent/ruby.rb'
--- a/test/indent/ruby.rb       2013-12-19 04:21:44 +0000
+++ b/test/indent/ruby.rb       2013-12-19 05:06:24 +0000
@@ -272,6 +272,8 @@
 # 
http://stackoverflow.com/questions/17786563/emacs-ruby-mode-if-expressions-indentation
 tee = if foo
         bar
+      else
+        tee
       end
 
 a = b {
@@ -328,6 +330,8 @@
   foo ||= begin
     bar
     tee
+  rescue
+    oomph
   end
 end