mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* misc/ruby-mode.el (ruby-parse-partial): use position of open paren.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31308 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
86576c8f28
commit
d9e6b7d6a5
3 changed files with 22 additions and 2 deletions
|
@ -1,3 +1,7 @@
|
||||||
|
Wed Apr 20 00:02:13 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* misc/ruby-mode.el (ruby-parse-partial): use position of open paren.
|
||||||
|
|
||||||
Tue Apr 19 01:00:21 2011 Tajima Akio <artonx@yahoo.co.jp>
|
Tue Apr 19 01:00:21 2011 Tajima Akio <artonx@yahoo.co.jp>
|
||||||
|
|
||||||
* test/ruby/test_io.rb (TestIO#test_cross_thread_close_fd):
|
* test/ruby/test_io.rb (TestIO#test_cross_thread_close_fd):
|
||||||
|
|
|
@ -556,7 +556,7 @@ Also ignores spaces after parenthesis when 'space."
|
||||||
(progn
|
(progn
|
||||||
(and (eq deep 'space) (looking-at ".\\s +[^# \t\n]")
|
(and (eq deep 'space) (looking-at ".\\s +[^# \t\n]")
|
||||||
(setq pnt (1- (match-end 0))))
|
(setq pnt (1- (match-end 0))))
|
||||||
(setq nest (cons (cons (char-after (point)) pnt) nest))
|
(setq nest (cons (cons (char-after (point)) (point)) nest))
|
||||||
(setq pcol (cons (cons pnt depth) pcol))
|
(setq pcol (cons (cons pnt depth) pcol))
|
||||||
(setq depth 0))
|
(setq depth 0))
|
||||||
(setq nest (cons (cons (char-after (point)) pnt) nest))
|
(setq nest (cons (cons (char-after (point)) pnt) nest))
|
||||||
|
@ -566,7 +566,7 @@ Also ignores spaces after parenthesis when 'space."
|
||||||
((looking-at "[])}]")
|
((looking-at "[])}]")
|
||||||
(if (ruby-deep-indent-paren-p (matching-paren (char-after))
|
(if (ruby-deep-indent-paren-p (matching-paren (char-after))
|
||||||
(if nest
|
(if nest
|
||||||
(1- (cdr (nth 0 nest)))
|
(cdr (nth 0 nest))
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(forward-char)
|
(forward-char)
|
||||||
(ruby-backward-sexp)
|
(ruby-backward-sexp)
|
||||||
|
|
|
@ -147,5 +147,21 @@ class TestRubyMode
|
||||||
| end
|
| end
|
||||||
|')
|
|')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_array_after_paren_and_space
|
||||||
|
assert_indent('
|
||||||
|
|class A
|
||||||
|
| def foo
|
||||||
|
| foo( [])
|
||||||
|
| end
|
||||||
|
|end
|
||||||
|
|', '
|
||||||
|
|class A
|
||||||
|
| def foo
|
||||||
|
|foo( [])
|
||||||
|
|end
|
||||||
|
| end
|
||||||
|
|')
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end if TestRubyMode::EMACS
|
end if TestRubyMode::EMACS
|
||||||
|
|
Loading…
Add table
Reference in a new issue