[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114734: * lisp/progmodes/ruby-mode.el (ruby-smie-ru
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] trunk r114734: * lisp/progmodes/ruby-mode.el (ruby-smie-rules): Indent after + used as |
Date: |
Mon, 21 Oct 2013 13:34:25 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114734
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2013-10-21 09:34:13 -0400
message:
* lisp/progmodes/ruby-mode.el (ruby-smie-rules): Indent after + used as
an instruction.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/progmodes/ruby-mode.el
rubymode.el-20091113204419-o5vbwnq5f7feedwu-8804
test/indent/ruby.rb ruby.rb-20120424165921-h044139hbrd7snvw-1
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-10-21 05:54:18 +0000
+++ b/lisp/ChangeLog 2013-10-21 13:34:13 +0000
@@ -1,3 +1,8 @@
+2013-10-21 Stefan Monnier <address@hidden>
+
+ * progmodes/ruby-mode.el (ruby-smie-rules): Indent after + used as
+ an instruction.
+
2013-10-21 Dmitry Gutov <address@hidden>
* progmodes/ruby-mode.el (ruby-smie-grammar): Add (almost) all infix
operators.
@@ -12,15 +17,14 @@
Allow comma separated lists after Java "implements".
- * progmodes/cc-engine.el (c-backward-over-enum-header): parse
- commas.
+ * progmodes/cc-engine.el (c-backward-over-enum-header):
+ Parse commas.
* progmodes/cc-fonts.el (c-basic-matchers-after): Remove comma
from a "disallowed" list in enum fontification.
2013-10-20 Johan Bockgård <address@hidden>
- * startup.el (default-frame-background-mode): Remove unused
- defvar.
+ * startup.el (default-frame-background-mode): Remove unused defvar.
* progmodes/verilog-mode.el (verilog-mode): Don't set
comment-indent-function globally.
@@ -168,8 +172,8 @@
* ielm.el (ielm-map): Bind M-RET to ielm-return-for-effect.
(ielm-return-for-effect): New command.
(ielm-send-input): Accept optional `for-effect' parameter.
- (ielm-eval-input): Accept optional `for-effect' parameter. Bind
- `standard-output' to stream we create using
+ (ielm-eval-input): Accept optional `for-effect' parameter.
+ Bind `standard-output' to stream we create using
`ielm-standard-output-impl'. Suppress printing result when
`for-effect'.
(ielm-standard-output-impl): New function.
=== modified file 'lisp/progmodes/ruby-mode.el'
--- a/lisp/progmodes/ruby-mode.el 2013-10-21 05:54:18 +0000
+++ b/lisp/progmodes/ruby-mode.el 2013-10-21 13:34:13 +0000
@@ -498,6 +498,8 @@
(`(:before . ,(or `"else" `"then" `"elsif" `"rescue" `"ensure")) 0)
(`(:before . ,(or `"when"))
(if (not (smie-rule-sibling-p)) 0)) ;; ruby-indent-level
+ (`(:after . "+") ;FIXME: Probably applicable to most infix operators.
+ (if (smie-rule-parent-p ";") ruby-indent-level))
))
(defun ruby-imenu-create-index-in-block (prefix beg end)
=== modified file 'test/indent/ruby.rb'
--- a/test/indent/ruby.rb 2013-10-21 06:15:47 +0000
+++ b/test/indent/ruby.rb 2013-10-21 13:34:13 +0000
@@ -186,11 +186,11 @@
bar
end
+foo +
+ bar
+
# Examples below still fail with `ruby-use-smie' on:
-foo +
- bar
-
foo = [1, 2, 3].map do |i|
i + 1
end
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114734: * lisp/progmodes/ruby-mode.el (ruby-smie-rules): Indent after + used as,
Stefan Monnier <=