Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
1fc8f655
Commit
1fc8f655
authored
Mar 21, 2014
by
Dmitry Gutov
Browse files
Fix bug#17050
* lisp/progmodes/ruby-mode.el (ruby-smie-rules): Add indentation rule for ` @ '.
parent
dada060d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
0 deletions
+26
-0
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/progmodes/ruby-mode.el
lisp/progmodes/ruby-mode.el
+4
-0
test/indent/ruby.rb
test/indent/ruby.rb
+17
-0
No files found.
lisp/ChangeLog
View file @
1fc8f655
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.
...
...
lisp/progmodes/ruby-mode.el
View file @
1fc8f655
...
...
@@ -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)
...
...
test/indent/ruby.rb
View file @
1fc8f655
...
...
@@ -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
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment