Commit 1fc8f655 authored by Dmitry Gutov's avatar Dmitry Gutov

Fix bug#17050

* lisp/progmodes/ruby-mode.el (ruby-smie-rules):
Add indentation rule for ` @ '.
parent dada060d
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>
* align.el (align-regexp): Remove superfluous backslash.
......
......@@ -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.
(unless (or (eolp) (forward-comment 1))
(cons 'column (current-column)))))
(`(:before . " @ ")
(save-excursion
(skip-chars-forward " \t")
(cons 'column (current-column))))
(`(:before . "do") (ruby-smie--indent-to-stmt))
(`(:before . ".")
(if (smie-rule-sibling-p)
......
......@@ -379,3 +379,20 @@ def qux
'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
}
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