]>
git.madduck.net Git - etc/vim.git/blobdiff - indent/python.vim
madduck's git repository
Every one of the projects in this repository is available at the canonical
URL git://git.madduck.net/madduck/pub/<projectpath> — see
each project's metadata for the exact URL.
All patches and comments are welcome. Please squash your changes to logical
commits before using git-format-patch and git-send-email to
patches@ git. madduck. net .
If you'd read over the Git project's submission guidelines and adhered to them,
I'd be especially grateful.
SSH access, as well as push access can be individually
arranged .
If you use my repositories frequently, consider adding the following
snippet to ~/.gitconfig and using the third clone URL listed for each
project:
[url "git://git.madduck.net/madduck/"]
insteadOf = madduck:
" <http://creativecommons.org/publicdomain/zero/1.0/>.
" Only load this indent file when no other was loaded.
" <http://creativecommons.org/publicdomain/zero/1.0/>.
" Only load this indent file when no other was loaded.
-if exists("b:did_indent" )
+if exists('b:did_indent' )
finish
endif
let b:did_indent = 1
finish
endif
let b:did_indent = 1
setlocal nolisp
setlocal autoindent
setlocal indentexpr=GetPythonPEPIndent(v:lnum)
setlocal indentkeys=!^F,o,O,<:>,0),0],0},=elif,=except
setlocal nolisp
setlocal autoindent
setlocal indentexpr=GetPythonPEPIndent(v:lnum)
setlocal indentkeys=!^F,o,O,<:>,0),0],0},=elif,=except
-setlocal tabstop=4
-setlocal softtabstop=4
-setlocal shiftwidth=4
if !exists('g:python_pep8_indent_multiline_string')
let g:python_pep8_indent_multiline_string = 0
if !exists('g:python_pep8_indent_multiline_string')
let g:python_pep8_indent_multiline_string = 0
\ '^\s*else\>': ['if', 'elif', 'for', 'try', 'except'],
\ }
let s:paren_pairs = ['()', '{}', '[]']
\ '^\s*else\>': ['if', 'elif', 'for', 'try', 'except'],
\ }
let s:paren_pairs = ['()', '{}', '[]']
-if &ft == 'pyrex' || &ft == 'cython'
+if &filetype ==# 'pyrex' || &filetype ==# '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)>'
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)>'
endfunction
else
function! s:sw()
endfunction
else
function! s:sw()
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
- if getline(lnum - 1) =~ '\\$'
+ if getline(lnum - 1) =~# '\\$'
let lnum = prevnonblank(lnum - 1)
else
let [paren_lnum, _] = s:find_opening_paren(lnum)
let lnum = prevnonblank(lnum - 1)
else
let [paren_lnum, _] = s:find_opening_paren(lnum)
let r = 1
for i in range(a:start, end)
call cursor(a:lnum, i)
let r = 1
for i in range(a:start, end)
call cursor(a:lnum, i)
- if !(eval(a:expr) || text[i-1] =~ '\s')
+ if !(eval(a:expr) || text[i-1] =~# '\s')
let nothing_after_opening_paren = s:match_expr_on_line(
\ s:skip_after_opening_paren, paren_lnum, paren_col+1)
let nothing_after_opening_paren = s:match_expr_on_line(
\ s:skip_after_opening_paren, paren_lnum, paren_col+1)
- let starts_with_closing_paren = getline(a:lnum) =~ '^\s*[])}]'
+ let starts_with_closing_paren = getline(a:lnum) =~# '^\s*[])}]'
if nothing_after_opening_paren
if starts_with_closing_paren
if nothing_after_opening_paren
if starts_with_closing_paren
" Search for final colon that is not inside something to be ignored.
while 1
" Search for final colon that is not inside something to be ignored.
while 1
- let curpos = getpos("." )[2]
+ let curpos = getpos('.' )[2]
if curpos == 1 | break | endif
if curpos == 1 | break | endif
- if eval(s:skip_special_chars) || text[curpos-1] =~ '\s'
+ if eval(s:skip_special_chars) || text[curpos-1] =~# '\s'
- elseif text[curpos-1] == ':'
+ elseif text[curpos-1] ==# ':'
return base + s:sw()
endif
break
endwhile
return base + s:sw()
endif
break
endwhile
- if text =~ '\\$' && !ignore_last_char
+ 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 this line is the continuation of a control statement
" indent further to distinguish the continuation line
" from the next logical line.
return base + s:sw()
endif
return base + s:sw()
endif
+ let empty = getline(a:lnum) =~# '^\s*$'
+
" If the previous statement was a stop-execution statement or a pass
if getline(start) =~# s:stop_statement
" Remove one level of indentation if the user hasn't already dedented
" If the previous statement was a stop-execution statement or a pass
if getline(start) =~# s:stop_statement
" Remove one level of indentation if the user hasn't already dedented
- if indent(a:lnum) > base - s:sw()
+ if empty || current > base - s:sw()
return base - s:sw()
endif
" Otherwise, trust the user
return -1
endif
return base - s:sw()
endif
" Otherwise, trust the user
return -1
endif
- if s:is_dedented_already(current, base)
+ if !empty && s:is_dedented_already(current, base)
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),
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
+ \ "synIDattr(v:val, 'name')" ), 'python\S*String') == -1
let match_quotes = match(line, '^\s*\zs\%("""\|''''''\)')
if match_quotes != -1
" closing multiline string
let match_quotes = match(line, '^\s*\zs\%("""\|''''''\)')
if match_quotes != -1
" closing multiline string
- let quotes = line[match_quotes:match_quotes+2 ]
+ let quotes = line[match_quotes:(match_quotes+2) ]
let pairpos = searchpairpos(quotes, '', quotes, 'b')
if pairpos[0] != 0
return indent(pairpos[0])
let pairpos = searchpairpos(quotes, '', quotes, 'b')
if pairpos[0] != 0
return indent(pairpos[0])
projects / etc / vim.git / blobdiff