kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* misc/ruby-mode.el (ruby-deep-indent-paren-p, ruby-calculate-indent):

Browse source 
do not apply deep-indent inside parens at the beginning of
  expressions.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31061 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-03-08 03:30:23 +00:00
parent bc650f27b4
commit 85df40e9ab
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Mar 8 12:30:06 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* misc/ruby-mode.el (ruby-deep-indent-paren-p, ruby-calculate-indent):
do not apply deep-indent inside parens at the beginning of
expressions.
Tue Mar 8 09:32:48 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (configure-ext, build-ext), ext/extmk.rb (extmake):

18
misc/ruby-mode.el
View file

@ -496,8 +496,12 @@ The variable ruby-indent-level controls the amount of indentation.
(no-error nil)
((error "unterminated string")))))
(defun ruby-deep-indent-paren-p (c)
(cond ((listp ruby-deep-indent-paren)
(defun ruby-deep-indent-paren-p (c &optional pos)
(cond ((save-excursion
(if pos (goto-char pos))
(ruby-expr-beg))
nil)
((listp ruby-deep-indent-paren)
(let ((deep (assoc c ruby-deep-indent-paren)))
(cond (deep
(or (cdr deep) ruby-deep-indent-paren-style))
@ -752,7 +756,8 @@ The variable ruby-indent-level controls the amount of indentation.
(setq indent nil)) ; do nothing
((car (nth 1 state)) ; in paren
(goto-char (setq begin (cdr (nth 1 state))))
(let ((deep (ruby-deep-indent-paren-p (car (nth 1 state)))))
(let ((deep (ruby-deep-indent-paren-p (car (nth 1 state))
(1- (cdr (nth 1 state))))))
(if deep
(cond ((and (eq deep t) (eq (car (nth 1 state)) paren))
(skip-syntax-backward " ")
@ -771,7 +776,8 @@ The variable ruby-indent-level controls the amount of indentation.
(goto-char parse-start) (back-to-indentation))
(setq indent (ruby-indent-size (current-column) (nth 2 state))))
(and (eq (car (nth 1 state)) paren)
(ruby-deep-indent-paren-p (matching-paren paren))
(ruby-deep-indent-paren-p (matching-paren paren)
(1- (cdr (nth 1 state))))
(search-backward (char-to-string paren))
(setq indent (current-column)))))
((and (nth 2 state) (> (nth 2 state) 0)) ; in nest
@ -796,7 +802,9 @@ The variable ruby-indent-level controls the amount of indentation.
(setq eol (point))
(beginning-of-line)
(cond
((and (not (ruby-deep-indent-paren-p paren))
((and (not (ruby-deep-indent-paren-p paren
(and (cdr (nth 1 state))
(1- (cdr (nth 1 state))))))
(re-search-forward ruby-negative eol t))
(and (not (eq ?_ (char-after (match-end 0))))
(setq indent (- indent ruby-indent-level))))