Use Docker for easier test running (#86)

[etc/vim.git] / indent / python.vim

diff --git a/indent/python.vim b/indent/python.vim
index b1ae8a2057b17580240514b6e222a39911cbebdb..a095ca64ed2e905043a5bf4d777a31512bede49d 100644 (file)
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -34,6 +34,10 @@ if !exists('g:python_pep8_indent_multiline_string')
     let g:python_pep8_indent_multiline_string = 0
 endif
 
     let g:python_pep8_indent_multiline_string = 0
 endif
 

+if !exists('g:python_pep8_indent_hang_closing')
+    let g:python_pep8_indent_hang_closing = 0
+endif
+

 let s:block_rules = {
             \ '^\s*elif\>': ['if', 'elif'],
             \ '^\s*except\>': ['try', 'except'],
 let s:block_rules = {
             \ '^\s*elif\>': ['if', 'elif'],
             \ '^\s*except\>': ['try', 'except'],


@@ -44,7 +48,8 @@ let s:block_rules_multiple = {
             \ }
 " Pairs to look for when searching for opening parenthesis.
 " The value is the maximum offset in lines.
             \ }
 " Pairs to look for when searching for opening parenthesis.
 " The value is the maximum offset in lines.

-let s:paren_pairs = {'()': 10, '[]': 100, '{}': 1000}
+let s:paren_pairs = {'()': 50, '[]': 100, '{}': 1000}
+

 if &filetype ==# 'pyrex' || &filetype ==# 'cython'
     let b:control_statement = '\v^\s*(class|def|if|while|with|for|except|cdef|cpdef)>'
 else
 if &filetype ==# 'pyrex' || &filetype ==# 'cython'
     let b:control_statement = '\v^\s*(class|def|if|while|with|for|except|cdef|cpdef)>'
 else


@@ -109,18 +114,16 @@ function! s:find_opening_paren(...)
     " Return if cursor is in a comment.
     exe 'if' s:skip_search '| return [0, 0] | endif'
 
     " 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)
     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
     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
 endfunction
 
 " Find the start of a multi-line statement


@@ -204,8 +207,11 @@ function! s:indent_like_opening_paren(lnum)
                 \ s:skip_after_opening_paren, paren_lnum, paren_col+1)
     let starts_with_closing_paren = getline(a:lnum) =~# '^\s*[])}]'
 
                 \ s:skip_after_opening_paren, paren_lnum, paren_col+1)
     let starts_with_closing_paren = getline(a:lnum) =~# '^\s*[])}]'
 

+    let hang_closing = get(b:, 'python_pep8_indent_hang_closing',
+                \ get(g:, 'python_pep8_indent_hang_closing', 0))
+

     if nothing_after_opening_paren
     if nothing_after_opening_paren

-        if starts_with_closing_paren
+        if starts_with_closing_paren && !hang_closing

             let res = base
         else
             let res = base + s:sw()
             let res = base
         else
             let res = base + s:sw()