[Emacs-diffs] trunk r114760: * lisp/progmodes/ruby-mode.el (ruby-smie-rules): Only align with parent of

[Stefan Monnier]

------------------------------------------------------------
revno: 114760
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2013-10-23 13:55:53 -0400
message:
  * lisp/progmodes/ruby-mode.el (ruby-smie-rules): Only align with parent of
  { if it is hanging.
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-10-23 17:18:11 +0000
+++ b/lisp/ChangeLog    2013-10-23 17:55:53 +0000
@@ -1,5 +1,8 @@
 2013-10-23  Stefan Monnier  <address@hidden>
 
+       * progmodes/ruby-mode.el (ruby-smie-rules): Only align with parent of
+       { if it is hanging.
+
        * progmodes/ruby-mode.el (ruby-smie-rules): Don't return 0 for
        :before ";".
 

=== modified file 'lisp/progmodes/ruby-mode.el'
--- a/lisp/progmodes/ruby-mode.el       2013-10-23 17:18:11 +0000
+++ b/lisp/progmodes/ruby-mode.el       2013-10-23 17:55:53 +0000
@@ -449,7 +449,7 @@
       ((smie-rule-parent-p "def" "begin" "do" "class" "module" "for"
                            "while" "until" "unless"
                            "if" "then" "elsif" "else" "when"
-                           "rescue" "ensure" "{")
+                           "rescue" "ensure")
        (smie-rule-parent ruby-indent-level))
       ;; For (invalid) code between switch and case.
       ;; (if (smie-parent-p "switch") 4)
@@ -457,7 +457,9 @@
     (`(:before . ,(or `"(" `"[" `"{"))
      (cond
       ((and (equal token "{")
-            (not (smie-rule-prev-p "(" "{" "[" "," "=>")))
+            (not (smie-rule-prev-p "(" "{" "[" "," "=>"))
+           (or (smie-rule-hanging-p)
+               (smie-rule-next-p "opening-|")))
        ;; Curly block opener.
        (smie-rule-parent))
       ((smie-rule-hanging-p)

=== modified file 'test/indent/ruby.rb'
--- a/test/indent/ruby.rb       2013-10-22 20:47:29 +0000
+++ b/test/indent/ruby.rb       2013-10-23 17:55:53 +0000
@@ -40,6 +40,10 @@
   a: b
 }
 
+foo = { a: b
+        a1: b1
+      }
+
 foo({
      a: b,
      c: d