X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/955f7c02983ec2dd3c40fd46d6ad5665f9dd1831..eb527d01d53257088da8c215b5d909623d543fad:/indent/python.vim?ds=sidebyside

diff --git a/indent/python.vim b/indent/python.vim
index a1dd43f..4306985 100644
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -40,7 +40,11 @@ let s:block_rules = {
             \ '^\s*finally\>': ['try', 'except', 'else']
             \ }
 let s:paren_pairs = ['()', '{}', '[]']
-let s:control_statement = '^\s*\(class\|def\|if\|while\|with\|for\|except\)\>'
+if &ft == 'pyrex' || &ft == 'cython'
+    let b:control_statement = '\v^\s*(class|def|if|while|with|for|except|cdef|cpdef)>'
+else
+    let b:control_statement = '\v^\s*(class|def|if|while|with|for|except)>'
+endif
 let s:stop_statement = '^\s*\(break\|continue\|raise\|return\|pass\)\>'
 
 " Skip strings and comments. Return 1 for chars to skip.
@@ -198,7 +202,7 @@ function! s:indent_like_opening_paren(lnum)
     " If this line is the continuation of a control statement
     " indent further to distinguish the continuation line
     " from the next logical line.
-    if text =~# s:control_statement && res == base + s:sw()
+    if text =~# b:control_statement && res == base + s:sw()
         return base + s:sw() * 2
     else
         return res
@@ -243,24 +247,23 @@ function! s:indent_like_previous_line(lnum)
     let ignore_last_char = eval(s:skip_special_chars)
 
     " Search for final colon that is not inside something to be ignored.
-    while search(':', 'bcW', lnum)
+    while 1
         let curpos = getpos(".")[2]
         if curpos == 1 | break | endif
-        if eval(s:skip_special_chars)
+        if eval(s:skip_special_chars) || text[curpos-1] =~ '\s'
             normal! h
             continue
-        endif
-        if !s:match_expr_on_line(s:skip_special_chars, lnum, curpos)
+        elseif text[curpos-1] == ':'
             return base + s:sw()
         endif
-        normal! h
+        break
     endwhile
 
     if text =~ '\\$' && !ignore_last_char
         " If this line is the continuation of a control statement
         " indent further to distinguish the continuation line
         " from the next logical line.
-        if getline(start) =~# s:control_statement
+        if getline(start) =~# b:control_statement
             return base + s:sw() * 2
         endif