From: Daniel Hahler <git@thequod.de>
Date: Thu, 5 Oct 2017 21:20:50 +0000 (+0200)
Subject: s:find_opening_paren: use known nearest for stopline
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/782b0f03dab8080df9d62d9a2014b19d9d738e09?ds=inline;hp=--cc

s:find_opening_paren: use known nearest for stopline
---

782b0f03dab8080df9d62d9a2014b19d9d738e09
diff --git a/indent/python.vim b/indent/python.vim
index b1ae8a2..20469e2 100644
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -109,18 +109,16 @@ function! s:find_opening_paren(...)
     " Return if cursor is in a comment.
     exe 'if' s:skip_search '| return [0, 0] | endif'
 
-    let positions = []
+    let nearest = [0, 0]
     for [p, maxoff] in items(s:paren_pairs)
-        let stopline = max([0, line('.') - maxoff])
-        call add(positions, searchpairpos(
-           \ '\V'.p[0], '', '\V'.p[1], 'bnW', s:skip_special_chars, stopline))
+        let stopline = max([0, line('.') - maxoff, nearest[0]])
+        let next = searchpairpos(
+           \ '\V'.p[0], '', '\V'.p[1], 'bnW', s:skip_special_chars, stopline)
+        if next[0] && (next[0] > nearest[0] || (next[0] == nearest[0] && next[1] > nearest[1]))
+            let nearest = next
+        endif
     endfor
-
-    " Remove empty matches and return the type with the closest match
-    call filter(positions, 'v:val[0]')
-    call sort(positions, 's:pair_sort')
-
-    return get(positions, -1, [0, 0])
+    return nearest
 endfunction
 
 " Find the start of a multi-line statement