s:find_opening_paren: remove wrong optimization

diff --git a/indent/python.vim b/indent/python.vim
index 977ec05f0a55a9719af64feff18baf5d9a1cf452..b053083091f96ed6d537f2fc89403096ab38f398 100644 (file)
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -119,16 +119,11 @@ function! s:find_opening_paren(lnum, col)
 
     let nearest = [0, 0]
     let timeout = g:python_pep8_indent_searchpair_timeout
 
     let nearest = [0, 0]
     let timeout = g:python_pep8_indent_searchpair_timeout

+    let skip_special_chars = 's:_skip_special_chars(line("."), col("."))'

     for [p, maxoff] in items(s:paren_pairs)
         let stopline = max([0, line('.') - maxoff, nearest[0]])
     for [p, maxoff] in items(s:paren_pairs)
         let stopline = max([0, line('.') - maxoff, nearest[0]])

-        let found = 0
-        while 1
-            let next = searchpairpos('\V'.p[0], '', '\V'.p[1], 'bnW', '', stopline, timeout)
-            if !next[0] || !s:_skip_special_chars(next[0], next[1])
-                break
-            endif
-            call cursor(next[0], next[1])
-        endwhile
+        let next = searchpairpos(
+           \ '\V'.p[0], '', '\V'.p[1], 'bnW', skip_special_chars, stopline, timeout)

         if next[0] && (next[0] > nearest[0] || (next[0] == nearest[0] && next[1] > nearest[1]))
             let nearest = next
         endif
         if next[0] && (next[0] > nearest[0] || (next[0] == nearest[0] && next[1] > nearest[1]))
             let nearest = next
         endif

diff --git a/spec/indent/indent_spec.rb b/spec/indent/indent_spec.rb
index 9c52235d37204b99ea3b72d3110370b23a9e32ba..4227b3f7ce144db13be636ec681ab34e8140b383 100644 (file)
--- a/spec/indent/indent_spec.rb
+++ b/spec/indent/indent_spec.rb
@@ -719,3 +719,11 @@ describe "Using O" do
     indent.should == 0
   end
 end
     indent.should == 0
   end
 end

+
+describe "searchpairpos" do
+  before { vim.feedkeys '\<ESC>ggdG' }
+  it "handles nested parenthesis" do
+    vim.feedkeys 'iif foo.startswith("("):\<CR>'
+    indent.should == shiftwidth
+  end
+end