[前][次][番号順一覧][スレッド一覧]

ruby-changes:19038

From: nobu <ko1@a...>
Date: Wed, 9 Mar 2011 23:06:28 +0900 (JST)
Subject: [ruby-changes:19038] Ruby:r31076 (trunk): * misc/ruby-mode.el (ruby-parse-partial): fix indent after aref.

nobu	2011-03-09 23:06:15 +0900 (Wed, 09 Mar 2011)

  New Revision: 31076

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

  Log:
    * misc/ruby-mode.el (ruby-parse-partial): fix indent after aref.

  Modified files:
    trunk/ChangeLog
    trunk/misc/ruby-mode.el
    trunk/test/misc/test_ruby_mode.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31075)
+++ ChangeLog	(revision 31076)
@@ -1,3 +1,7 @@
+Wed Mar  9 23:06:13 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* misc/ruby-mode.el (ruby-parse-partial): fix indent after aref.
+
 Wed Mar  9 12:50:24 2011  Aaron Patterson <aaron@t...>
 
 	* ext/psych/lib/psych/visitors/yaml_tree.rb: Rescue exceptions when
Index: misc/ruby-mode.el
===================================================================
--- misc/ruby-mode.el	(revision 31075)
+++ misc/ruby-mode.el	(revision 31076)
@@ -602,7 +602,12 @@
         )
        ((looking-at "[])}]")
         (if (ruby-deep-indent-paren-p (matching-paren (char-after))
-				      (save-excursion (ruby-backward-sexp) (point)))
+				      (if nest
+					  (1- (cdr (nth 0 nest)))
+					(save-excursion
+					  (forward-char)
+					  (ruby-backward-sexp)
+					  (point))))
             (setq depth (cdr (car pcol)) pcol (cdr pcol))
           (setq depth (1- depth)))
         (setq nest (cdr nest))
Index: test/misc/test_ruby_mode.rb
===================================================================
--- test/misc/test_ruby_mode.rb	(revision 31075)
+++ test/misc/test_ruby_mode.rb	(revision 31076)
@@ -132,5 +132,17 @@
       |  end
       |')
     end
+
+    def test_array_literal
+      assert_indent('
+      |begin
+      |  a[b]
+      |end
+      |', '
+      |begin
+      | a[b]
+      |  end
+      |')
+    end
   end
 end if TestRubyMode::EMACS

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

[前][次][番号順一覧][スレッド一覧]