[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [ruby-mode] Private/protected method definition layout in Ruby 2.1
From: |
Dmitry Gutov |
Subject: |
Re: [ruby-mode] Private/protected method definition layout in Ruby 2.1 |
Date: |
Thu, 16 Jan 2014 07:47:01 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) |
Bozhidar Batsov <address@hidden> writes:
> recent changes we did to accommodate similar alignment for `if/unless
> ` it seems like a good idea to add a defcustom supporting the first
> style as well.
Come to think of it, why not reuse the same mechanism and defcustom?
The patch below seems to work. Comments?
=== modified file 'lisp/progmodes/ruby-mode.el'
--- lisp/progmodes/ruby-mode.el 2014-01-10 16:32:45 +0000
+++ lisp/progmodes/ruby-mode.el 2014-01-16 05:35:37 +0000
@@ -226,7 +226,10 @@
: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 @@
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 @@
(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 token) ruby-alignable-keywords)))
(when (not (ruby--at-indentation-p))
(if (ruby-smie--indent-to-stmt-p token)
(ruby-smie--indent-to-stmt)
- [ruby-mode] Private/protected method definition layout in Ruby 2.1, Bozhidar Batsov, 2014/01/15
- Re: [ruby-mode] Private/protected method definition layout in Ruby 2.1, Stefan Monnier, 2014/01/15
- Re: [ruby-mode] Private/protected method definition layout in Ruby 2.1,
Dmitry Gutov <=
- Re: [ruby-mode] Private/protected method definition layout in Ruby 2.1, Bozhidar Batsov, 2014/01/16
- Re: [ruby-mode] Private/protected method definition layout in Ruby 2.1, Dmitry Gutov, 2014/01/16
- Re: [ruby-mode] Private/protected method definition layout in Ruby 2.1, Bozhidar Batsov, 2014/01/16
- Re: [ruby-mode] Private/protected method definition layout in Ruby 2.1, Dmitry Gutov, 2014/01/16
- Re: [ruby-mode] Private/protected method definition layout in Ruby 2.1, Bozhidar Batsov, 2014/01/16
- Re: [ruby-mode] Private/protected method definition layout in Ruby 2.1, Dmitry Gutov, 2014/01/16