naruse	2011-09-15 23:05:20 +0900 (Thu, 15 Sep 2011)

  New Revision: 33278

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33278

  Log:
    Revert indentation improvement.
    
    r31061, r31065, r31076, r31308.
    Because of half baked.

  Modified files:
    branches/ruby_1_9_3/misc/ruby-mode.el
    branches/ruby_1_9_3/test/misc/test_ruby_mode.rb

Index: ruby_1_9_3/misc/ruby-mode.el
===================================================================
--- ruby_1_9_3/misc/ruby-mode.el	(revision 33277)
+++ ruby_1_9_3/misc/ruby-mode.el	(revision 33278)
@@ -459,12 +459,8 @@
           (no-error nil)
           ((error "unterminated string")))))
 
-(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)
+(defun ruby-deep-indent-paren-p (c)
+  (cond ((listp ruby-deep-indent-paren)
          (let ((deep (assoc c ruby-deep-indent-paren)))
            (cond (deep
                   (or (cdr deep) ruby-deep-indent-paren-style))
@@ -556,7 +552,7 @@
               (progn
                 (and (eq deep 'space) (looking-at ".\\s +[^# \t\n]")
                      (setq pnt (1- (match-end 0))))
-                (setq nest (cons (cons (char-after (point)) (point)) nest))
+                (setq nest (cons (cons (char-after (point)) pnt) nest))
                 (setq pcol (cons (cons pnt depth) pcol))
                 (setq depth 0))
             (setq nest (cons (cons (char-after (point)) pnt) nest))
@@ -564,13 +560,7 @@
         (goto-char pnt)
         )
        ((looking-at "[])}]")
-        (if (ruby-deep-indent-paren-p (matching-paren (char-after))
-				      (if nest
-					  (cdr (nth 0 nest))
-					(save-excursion
-					  (forward-char)
-					  (ruby-backward-sexp)
-					  (point))))
+        (if (ruby-deep-indent-paren-p (matching-paren (char-after)))
             (setq depth (cdr (car pcol)) pcol (cdr pcol))
           (setq depth (1- depth)))
         (setq nest (cdr nest))
@@ -725,8 +715,7 @@
         (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))
-					      (1- (cdr (nth 1 state))))))
+        (let ((deep (ruby-deep-indent-paren-p (car (nth 1 state)))))
           (if deep
               (cond ((and (eq deep t) (eq (car (nth 1 state)) paren))
                      (skip-syntax-backward " ")
@@ -745,8 +734,7 @@
               (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)
-					 (1- (cdr (nth 1 state))))
+               (ruby-deep-indent-paren-p (matching-paren paren))
                (search-backward (char-to-string paren))
                (setq indent (current-column)))))
        ((and (nth 2 state) (> (nth 2 state) 0)) ; in nest
@@ -771,9 +759,7 @@
         (setq eol (point))
         (beginning-of-line)
         (cond
-         ((and (not (ruby-deep-indent-paren-p paren
-					      (and (cdr (nth 1 state))
-						   (1- (cdr (nth 1 state))))))
+         ((and (not (ruby-deep-indent-paren-p paren))
                (re-search-forward ruby-negative eol t))
           (and (not (eq ?_ (char-after (match-end 0))))
                (setq indent (- indent ruby-indent-level))))
Index: ruby_1_9_3/test/misc/test_ruby_mode.rb
===================================================================
--- ruby_1_9_3/test/misc/test_ruby_mode.rb	(revision 33277)
+++ ruby_1_9_3/test/misc/test_ruby_mode.rb	(revision 33278)
@@ -137,33 +137,5 @@
       |  end
       |')
     end
-
-    def test_begin_end
-      assert_indent('
-      |begin
-      |  a[b]
-      |end
-      |', '
-      |begin
-      | a[b]
-      |  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 if TestRubyMode::EMACS

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/