]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Improve s:find_start_of_multiline_statement: only look for round parens
authorDaniel Hahler <git@thequod.de>
Mon, 9 Oct 2017 02:18:35 +0000 (04:18 +0200)
committerDaniel Hahler <git@thequod.de>
Mon, 9 Oct 2017 02:18:35 +0000 (04:18 +0200)
indent/python.vim

index 20469e2385fbf67a22b38688873499c8db72106b..22ca76fcb9e3791ea721aeee99cebe1c614a37b7 100644 (file)
@@ -45,6 +45,10 @@ let s:block_rules_multiple = {
 " Pairs to look for when searching for opening parenthesis.
 " The value is the maximum offset in lines.
 let s:paren_pairs = {'()': 10, '[]': 100, '{}': 1000}
+
+" Maximum offset when looking for multiline statements (in round parenthesis).
+let s:maxoff_multiline_statement = 50
+
 if &filetype ==# 'pyrex' || &filetype ==# 'cython'
     let b:control_statement = '\v^\s*(class|def|if|while|with|for|except|cdef|cpdef)>'
 else
@@ -121,19 +125,21 @@ function! s:find_opening_paren(...)
     return nearest
 endfunction
 
-" Find the start of a multi-line statement
+" Find the start of a multi-line statement (based on surrounding parens).
 function! s:find_start_of_multiline_statement(lnum)
     let lnum = a:lnum
     while lnum > 0
+        " XXX: not tested?!
         if getline(lnum - 1) =~# '\\$'
             let lnum = prevnonblank(lnum - 1)
         else
-            let [paren_lnum, _] = s:find_opening_paren(lnum)
-            if paren_lnum < 1
-                return lnum
-            else
-                let lnum = paren_lnum
+            call cursor(lnum, 1)
+            let stopline = max([1, lnum - s:maxoff_multiline_statement])
+            let pos = searchpairpos('\V(', '', '\V)', 'bnW', s:skip_special_chars, stopline)
+            if pos[0]
+                return pos[0]
             endif
+            return lnum
         endif
     endwhile
 endfunction