Merge pull request #19 from kljohann/tests

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

diff --git a/indent/python.vim b/indent/python.vim
index 69ce187844d767af9e3fa8954d1ce03d4aec8376..4d1edc2310908c6cd2f36160c7349b6435a756e0 100644 (file)
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -3,7 +3,6 @@
 " Maintainer:       Hynek Schlawack <hs@ox.cx>
 " Prev Maintainer:  Eric Mc Sween <em@tomcom.de> (address invalid)
 " Original Author:  David Bustos <bustos@caltech.edu> (address invalid)
 " Maintainer:       Hynek Schlawack <hs@ox.cx>
 " Prev Maintainer:  Eric Mc Sween <em@tomcom.de> (address invalid)
 " Original Author:  David Bustos <bustos@caltech.edu> (address invalid)

-" Last Change:      2012-06-21

 " License:          Public Domain
 
 " Only load this indent file when no other was loaded.
 " License:          Public Domain
 
 " Only load this indent file when no other was loaded.


@@ -170,12 +169,18 @@ function! GetPythonPEPIndent(lnum)
             return maybe_indent + &sw
         else
             " control structure not found
             return maybe_indent + &sw
         else
             " control structure not found

-            return maybe_indent 
+            return maybe_indent

         endif
     endif
 
     " If the previous line ended with a colon and is not a comment, indent
     " relative to statement start.
         endif
     endif
 
     " If the previous line ended with a colon and is not a comment, indent
     " relative to statement start.

+    let pline = substitute(pline, '\\\\', '', 'g')
+    if v:version > 703 || (v:version == 703 && has('patch1037'))
+        let pline = substitute(pline, '".\{-}\\\@1<!"\|''.\{-}\\\@1<!''', '', 'g')
+    else
+        let pline = substitute(pline, '".\{-}\\\@<!"\|''.\{-}\\\@<!''', '', 'g')
+    endif

     if pline =~ '^[^#]*:\s*\(#.*\)\?$'
         return indent(sslnum) + &sw
     endif
     if pline =~ '^[^#]*:\s*\(#.*\)\?$'
         return indent(sslnum) + &sw
     endif


@@ -191,6 +196,13 @@ function! GetPythonPEPIndent(lnum)
         return -1
     endif
 
         return -1
     endif
 

+    " If this line is dedented and the number of indent spaces is valid
+    " (multiple of the indentation size), trust the user
+    let dedent_size = thisindent - indent(plnum)
+    if dedent_size < 0 && thisindent % &sw == 0
+        return -1
+    endif
+

     " In all other cases, line up with the start of the previous statement.
     return indent(sslnum)
 endfunction
     " In all other cases, line up with the start of the previous statement.
     return indent(sslnum)
 endfunction