Commit fb3d479c authored by Dmitry Gutov's avatar Dmitry Gutov

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).
parent fc23fe2d
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.
......
......@@ -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)
......
......@@ -331,6 +331,10 @@ def qux
end
end
private def foo
bar
end
%^abc^
ddd
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment