ruby-mode: Align def...end to the beginning of statement

* lisp/progmodes/ruby-mode.el (ruby-alignable-keywords): New constant.
(ruby-align-to-stmt-keywords): Change the default value.  Use
`ruby-alignable-keywords' to generate the possible customization
choices.
(ruby-smie-rules): Instead of using a hardcoded list of alignable
keywords, check against the value of `ruby-alignable-keywords'
(http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01439.html).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b98f68c99aedceac69f2060547dbd6df7c47a92b..25c4e9e75b7cf232b174cce6132599e930d082a2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2014-01-17  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * progmodes/ruby-mode.el (ruby-alignable-keywords): New constant.
+       (ruby-align-to-stmt-keywords): Change the default value.  Use
+       `ruby-alignable-keywords' to generate the possible customization
+       choices.
+       (ruby-smie-rules): Instead of using a hardcoded list of alignable
+       keywords, check against the value of `ruby-alignable-keywords'
+       (http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01439.html).
+
 2014-01-17  Glenn Morris  <rgm@gnu.org>
 
        * emacs-lisp/authors.el (authors-aliases): Remove unnecessary entries.

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 76945adaacbb2ffdc2608ca10cf0a3a66815b2b1..f0a9da80ea4bf7695a8be796abcd9d0487c45d19 100644 (file)
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -226,7 +226,10 @@ This should only be called after matching against `ruby-here-doc-beg-re'."
   :group 'ruby
   :safe 'integerp)
 
-(defcustom ruby-align-to-stmt-keywords nil
+(defconst ruby-alignable-keywords '(if while unless until begin case for def)
+  "Keywords that can be used in `ruby-align-to-stmt-keywords'.")
+
+(defcustom ruby-align-to-stmt-keywords '(def)
   "Keywords after which we align the expression body to statement.
 
 When nil, an expression that begins with one these keywords is
@@ -250,17 +253,13 @@ the statement:
 
 Only has effect when `ruby-use-smie' is t.
 "
-  :type '(choice
+  :type `(choice
           (const :tag "None" nil)
           (const :tag "All" t)
           (repeat :tag "User defined"
-                  (choice (const if)
-                          (const while)
-                          (const unless)
-                          (const until)
-                          (const begin)
-                          (const case)
-                          (const for))))
+                  (choice ,@(mapcar
+                             (lambda (kw) (list 'const kw))
+                             ruby-alignable-keywords))))
   :group 'ruby
   :safe 'listp
   :version "24.4")
@@ -639,7 +638,7 @@ It is used when `ruby-encoding-magic-comment-style' is set to `custom'."
           (smie-indent--hanging-p)
           ruby-indent-level))
     (`(:after . ,(or "?" ":")) ruby-indent-level)
-    (`(:before . ,(or "if" "while" "unless" "until" "begin" "case" "for"))
+    (`(:before . ,(guard (memq (intern-soft token) ruby-alignable-keywords)))
      (when (not (ruby--at-indentation-p))
        (if (ruby-smie--indent-to-stmt-p token)
            (ruby-smie--indent-to-stmt)

diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb
index 0d47bbcf7c0760681d8d687161ea3c340ebad1a7..a0116fef18ee7c4379ee621aa8cbf059dd82203f 100644 (file)
--- a/test/indent/ruby.rb
+++ b/test/indent/ruby.rb
@@ -331,6 +331,10 @@ def qux
           end
 end
 
+private def foo
+  bar
+end
+
 %^abc^
 ddd