\ '^\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.
" 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
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
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 = current - base
- if dedent_size < 0 && current % s:sw() == 0
+ if s:is_dedented_already(current, base)
return -1
endif
return base
endfunction
+" If this line is dedented and the number of indent spaces is valid
+" (multiple of the indentation size), trust the user.
+function! s:is_dedented_already(current, base)
+ let dedent_size = a:current - a:base
+ return (dedent_size < 0 && a:current % s:sw() == 0) ? 1 : 0
+endfunction
+
" Is the syntax at lnum (and optionally cnum) a python string?
function! s:is_python_string(lnum, ...)
let line = getline(a:lnum)