Merge pull request #112 from blueyed/fix-97

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

diff --git a/indent/python.vim b/indent/python.vim
index e251ce286b944d36f792b22e14c661db01c50493..c56c2dc1f4e73aa14ec88295427677139aa8ecc1 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'],


@@ -46,9 +50,6 @@ let s:block_rules_multiple = {
 " The value is the maximum offset in lines.
 let s:paren_pairs = {'()': 50, '[]': 100, '{}': 1000}
 
 " The value is the maximum offset in lines.
 let s:paren_pairs = {'()': 50, '[]': 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
 if &filetype ==# 'pyrex' || &filetype ==# 'cython'
     let b:control_statement = '\v^\s*(class|def|if|while|with|for|except|cdef|cpdef)>'
 else


@@ -91,14 +92,6 @@ else
     endfunction
 endif
 
     endfunction
 endif
 

-function! s:pair_sort(x, y)
-    if a:x[0] == a:y[0]
-        return a:x[1] == a:y[1] ? 0 : a:x[1] > a:y[1] ? 1 : -1
-    else
-        return a:x[0] > a:y[0] ? 1 : -1
-    endif
-endfunction
-

 " Find backwards the closest open parenthesis/bracket/brace.
 function! s:find_opening_paren(...)
     " optional arguments: line and column (defaults to 1) to search around
 " Find backwards the closest open parenthesis/bracket/brace.
 function! s:find_opening_paren(...)
     " optional arguments: line and column (defaults to 1) to search around


@@ -125,21 +118,19 @@ function! s:find_opening_paren(...)
     return nearest
 endfunction
 
     return nearest
 endfunction
 

-" Find the start of a multi-line statement (based on surrounding parens).
+" Find the start of a multi-line statement

 function! s:find_start_of_multiline_statement(lnum)
     let lnum = a:lnum
     while lnum > 0
 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
         if getline(lnum - 1) =~# '\\$'
             let lnum = prevnonblank(lnum - 1)
         else

-            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]
+            let [paren_lnum, _] = s:find_opening_paren(lnum)
+            if paren_lnum < 1
+                return lnum
+            else
+                let lnum = paren_lnum

             endif
             endif

-            return lnum

         endif
     endwhile
 endfunction
         endif
     endwhile
 endfunction


@@ -147,27 +138,21 @@ endfunction
 " Find possible indent(s) of the block starter that matches the current line.
 function! s:find_start_of_block(lnum, types, multiple)
     let r = []
 " Find possible indent(s) of the block starter that matches the current line.
 function! s:find_start_of_block(lnum, types, multiple)
     let r = []

-    let types = copy(a:types)

     let re = '\V\^\s\*\('.join(a:types, '\|').'\)\>'
     let lnum = a:lnum
     let last_indent = indent(lnum) + 1
     while lnum > 0 && last_indent > 0
         let indent = indent(lnum)
         if indent < last_indent
     let re = '\V\^\s\*\('.join(a:types, '\|').'\)\>'
     let lnum = a:lnum
     let last_indent = indent(lnum) + 1
     while lnum > 0 && last_indent > 0
         let indent = indent(lnum)
         if indent < last_indent

-            for type in types
-                let re = '\v^\s*'.type.'>'
-                if getline(lnum) =~# re
-                    if !a:multiple
-                        return [indent]
-                    endif
-                    if index(r, indent) == -1
-                        let r += [indent]
-                    endif
-                    " Remove any handled type, e.g. 'if'.
-                    call remove(types, index(types, type))
+            if getline(lnum) =~# re
+                if !a:multiple
+                    return [indent]

                 endif
                 endif

-            endfor
-            let last_indent = indent(lnum)
+                if index(r, indent) == -1
+                    let r += [indent]
+                endif
+                let last_indent = indent
+            endif

         endif
         let lnum = prevnonblank(lnum - 1)
     endwhile
         endif
         let lnum = prevnonblank(lnum - 1)
     endwhile


@@ -208,8 +193,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()


@@ -223,10 +211,13 @@ function! s:indent_like_opening_paren(lnum)
     " indent further to distinguish the continuation line
     " from the next logical line.
     if text =~# b:control_statement && res == base + s:sw()
     " indent further to distinguish the continuation line
     " from the next logical line.
     if text =~# b:control_statement && res == base + s:sw()

-        return base + s:sw() * 2
-    else
-        return res
+        " But only if not inside parens itself (Flake's E127).
+        let [paren_lnum, _] = s:find_opening_paren(paren_lnum)
+        if paren_lnum <= 0
+            return res + s:sw()
+        endif

     endif
     endif

+    return res

 endfunction
 
 " Match indent of first block of this type.
 endfunction
 
 " Match indent of first block of this type.


@@ -340,11 +331,11 @@ endfunction
 " Is the syntax at lnum (and optionally cnum) a python string?
 function! s:is_python_string(lnum, ...)
     let line = getline(a:lnum)
 " Is the syntax at lnum (and optionally cnum) a python string?
 function! s:is_python_string(lnum, ...)
     let line = getline(a:lnum)

-    let linelen = len(line)
-    if linelen < 1
-      let linelen = 1
+    if a:0
+      let cols = type(a:1) != type([]) ? [a:1] : a:1
+    else
+      let cols = range(1, max([1, len(line)]))

     endif
     endif

-    let cols = a:0 ? type(a:1) != type([]) ? [a:1] : a:1 : range(1, linelen)

     for cnum in cols
         if match(map(synstack(a:lnum, cnum),
                     \ "synIDattr(v:val, 'name')"), 'python\S*String') == -1
     for cnum in cols
         if match(map(synstack(a:lnum, cnum),
                     \ "synIDattr(v:val, 'name')"), 'python\S*String') == -1


@@ -364,7 +355,7 @@ function! GetPythonPEPIndent(lnum)
     let prevline = getline(a:lnum-1)
 
     " Multilinestrings: continous, docstring or starting.
     let prevline = getline(a:lnum-1)
 
     " Multilinestrings: continous, docstring or starting.

-    if s:is_python_string(a:lnum-1, len(prevline))
+    if s:is_python_string(a:lnum-1, max([1, len(prevline)]))

                 \ && (s:is_python_string(a:lnum, 1)
                 \     || match(line, '^\%("""\|''''''\)') != -1)
 
                 \ && (s:is_python_string(a:lnum, 1)
                 \     || match(line, '^\%("""\|''''''\)') != -1)
 


@@ -382,8 +373,8 @@ function! GetPythonPEPIndent(lnum)
         endif
 
         if s:is_python_string(a:lnum-1)
         endif
 
         if s:is_python_string(a:lnum-1)

-            " Previous line is (completely) a string.
-            return indent(a:lnum-1)
+            " Previous line is (completely) a string: keep current indent.
+            return -1

         endif
 
         if match(prevline, '^\s*\%("""\|''''''\)') != -1
         endif
 
         if match(prevline, '^\s*\%("""\|''''''\)') != -1