fix regression for multiple parens of different types

diff --git a/indent/python.vim b/indent/python.vim
index 3b64cf4263985de8341580f6ca77b9857ed5832f..6fb188903dd98a175755cc8c079890fc84564857 100644 (file)
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -80,7 +80,7 @@ function! s:find_opening_paren(...)
     call filter(positions, 'v:val[0]')
     call sort(positions, 's:pair_sort')
 
     call filter(positions, 'v:val[0]')
     call sort(positions, 's:pair_sort')
 

-    return get(positions, 0, [0, 0])
+    return get(positions, -1, [0, 0])

 endfunction
 
 " Find the start of a multi-line statement
 endfunction
 
 " Find the start of a multi-line statement

diff --git a/spec/indent/indent_spec.rb b/spec/indent/indent_spec.rb
index df402e8cb9fc25c11f984d2b8fa4656865b5f24f..4652ef9762ecb4302957ab480a959d6de61db78b 100644 (file)
--- a/spec/indent/indent_spec.rb
+++ b/spec/indent/indent_spec.rb
@@ -67,6 +67,18 @@ shared_examples_for "vim" do
     end
   end
 
     end
   end
 

+  describe "when after multiple parens of different types" do
+    it "indents by one level" do
+      vim.feedkeys 'if({\<CR>'
+      indent.should == shiftwidth
+    end
+
+    it "lines up with the last paren" do
+      vim.feedkeys 'ifff({123: 456,\<CR>'
+      indent.should == 5
+    end
+  end
+

   describe "when '#' is contained in a string that is followed by a colon" do
     it "indents by one level" do
         vim.feedkeys 'iif "some#thing" == "test":#test\<CR>pass'
   describe "when '#' is contained in a string that is followed by a colon" do
     it "indents by one level" do
         vim.feedkeys 'iif "some#thing" == "test":#test\<CR>pass'