mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00
Code Issues Releases Activity

Fix bug#17050

Browse Source 
* lisp/progmodes/ruby-mode.el (ruby-smie-rules):
Add indentation rule for ` @ '.
This commit is contained in:
Dmitry Gutov 2014-03-21 06:26:39 +02:00
parent dada060d9f
commit 1fc8f6559a
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2014-03-21 Dmitry Gutov <dgutov@yandex.ru>
* progmodes/ruby-mode.el (ruby-smie-rules):
Add indentation rule for ` @ '. (Bug#17050)
2014-03-21 Juanma Barranquero <lekktu@gmail.com> 2014-03-21 Juanma Barranquero <lekktu@gmail.com>
* align.el (align-regexp): Remove superfluous backslash. * align.el (align-regexp): Remove superfluous backslash.

4
lisp/progmodes/ruby-mode.el
View File

@ -650,6 +650,10 @@ It is used when `ruby-encoding-magic-comment-style' is set to `custom'."
;; because we want to reject hanging tokens at bol, too. ;; because we want to reject hanging tokens at bol, too.
(unless (or (eolp) (forward-comment 1)) (unless (or (eolp) (forward-comment 1))
(cons 'column (current-column))))) (cons 'column (current-column)))))
(`(:before . " @ ")
(save-excursion
(skip-chars-forward " \t")
(cons 'column (current-column))))
(`(:before . "do") (ruby-smie--indent-to-stmt)) (`(:before . "do") (ruby-smie--indent-to-stmt))
(`(:before . ".") (`(:before . ".")
(if (smie-rule-sibling-p) (if (smie-rule-sibling-p)

17
test/indent/ruby.rb
View File

@ -379,3 +379,20 @@ def qux
'd' => %w(e f) 'd' => %w(e f)
} }
} }
# Bug#17050
return render json: {
errors: { base: [message] },
copying: copying
},
status: 400
top test(
some,
top,
test)
foo bar, {
tee: qux
}