mirror of
https://github.com/gryf/.vim.git
synced 2025-12-17 11:30:29 +01:00
Added exclude variable for pep8
changed the way that indent is attached to python files (fuck you iCard) added convinient snippets for rest files
This commit is contained in:
12
.vimrc
12
.vimrc
@@ -157,10 +157,14 @@ let g:pydoc_cmd = "/usr/bin/pydoc"
|
|||||||
"}}}
|
"}}}
|
||||||
"mark {{{
|
"mark {{{
|
||||||
" addidtional colors --
|
" addidtional colors --
|
||||||
highlight def MarkWord7 ctermbg=White ctermfg=Black guibg=#E8E8E8 guifg=Black
|
fun! s:CustomHighlightings()
|
||||||
highlight def MarkWord8 ctermbg=LightGray ctermfg=Black guibg=#C0C0C0 guifg=Black
|
highlight def MarkWord7 ctermbg=White ctermfg=Black guibg=#E8E8E8 guifg=Black
|
||||||
highlight def MarkWord9 ctermbg=DarkYellow ctermfg=Black guibg=#FFC299 guifg=Black
|
highlight def MarkWord8 ctermbg=LightGray ctermfg=Black guibg=#C0C0C0 guifg=Black
|
||||||
highlight def MarkWord10 ctermbg=DarkGreen ctermfg=Black guibg=#6E9954 guifg=Black
|
highlight def MarkWord9 ctermbg=DarkYellow ctermfg=Black guibg=#FFC299 guifg=Black
|
||||||
|
highlight def MarkWord10 ctermbg=DarkGreen ctermfg=Black guibg=#6E9954 guifg=Black
|
||||||
|
endfun
|
||||||
|
autocmd ColorScheme * call <SID>CustomHighlightings()
|
||||||
|
|
||||||
"}}}
|
"}}}
|
||||||
" DirDiff{{{
|
" DirDiff{{{
|
||||||
let g:DirDiffExcludes = "CVS,*.class,*.exe,.*.swp,*.pyc,*.pyo"
|
let g:DirDiffExcludes = "CVS,*.class,*.exe,.*.swp,*.pyc,*.pyo"
|
||||||
|
|||||||
@@ -46,12 +46,17 @@
|
|||||||
"
|
"
|
||||||
" }}}
|
" }}}
|
||||||
|
|
||||||
|
|
||||||
if exists("b:did_pep8_plugin")
|
if exists("b:did_pep8_plugin")
|
||||||
finish " only load once
|
finish " only load once
|
||||||
else
|
else
|
||||||
let b:did_pep8_plugin = 1
|
let b:did_pep8_plugin = 1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if !exists("g:pep8_exclude")
|
||||||
|
let g:pep8_exclude = []
|
||||||
|
endif
|
||||||
|
|
||||||
if !exists("b:did_pep8_init")
|
if !exists("b:did_pep8_init")
|
||||||
let b:did_pep8_init = 0
|
let b:did_pep8_init = 0
|
||||||
|
|
||||||
@@ -76,6 +81,7 @@ class VImPep8(object):
|
|||||||
self.fname = vim.current.buffer.name
|
self.fname = vim.current.buffer.name
|
||||||
self.bufnr = vim.current.buffer.number
|
self.bufnr = vim.current.buffer.number
|
||||||
self.output = []
|
self.output = []
|
||||||
|
self.exclude_list = vim.eval("g:pep8_exclude")
|
||||||
|
|
||||||
def reporter(self, lnum, col, text, check):
|
def reporter(self, lnum, col, text, check):
|
||||||
self.output.append([lnum, col, text])
|
self.output.append([lnum, col, text])
|
||||||
@@ -93,6 +99,13 @@ class VImPep8(object):
|
|||||||
qf_dict = {}
|
qf_dict = {}
|
||||||
|
|
||||||
for line in self.output:
|
for line in self.output:
|
||||||
|
skip = False
|
||||||
|
for exclude_pattern in self.exclude_list:
|
||||||
|
if exclude_pattern in line[2]:
|
||||||
|
skip = True
|
||||||
|
break
|
||||||
|
if skip:
|
||||||
|
continue
|
||||||
qf_dict['bufnr'] = self.bufnr
|
qf_dict['bufnr'] = self.bufnr
|
||||||
qf_dict['lnum'] = line[0]
|
qf_dict['lnum'] = line[0]
|
||||||
qf_dict['col'] = line[1]
|
qf_dict['col'] = line[1]
|
||||||
|
|||||||
@@ -1,262 +1,10 @@
|
|||||||
" Vim indent file
|
" This dirty hack for boys from BTH will be erased after this embrassing
|
||||||
" Language: Python
|
" project end.
|
||||||
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
let current_file = expand('%:p')
|
||||||
" Original Author: David Bustos <bustos@caltech.edu>
|
|
||||||
" Last Change: 2008 Mar 14
|
|
||||||
" Changed my Jason Casden to try to prettify the line continuations
|
|
||||||
|
|
||||||
" Only load this indent file when no other was loaded.
|
if match(current_file, '\cicard') < 0
|
||||||
if exists("b:did_indent")
|
source $HOME/.vim/indent/python_pep8.vim
|
||||||
finish
|
else
|
||||||
|
let g:pep8_exclude=['W191']
|
||||||
|
source $VIMRUNTIME/indent/python.vim
|
||||||
endif
|
endif
|
||||||
let b:did_indent = 1
|
|
||||||
let g:linecont = 0
|
|
||||||
|
|
||||||
" Some preliminary settings
|
|
||||||
setlocal nolisp " Make sure lisp indenting doesn't supersede us
|
|
||||||
setlocal autoindent " indentexpr isn't much help otherwise
|
|
||||||
|
|
||||||
setlocal indentexpr=GetPythonIndent(v:lnum)
|
|
||||||
setlocal indentkeys+=<:>,=elif,=except
|
|
||||||
|
|
||||||
" Only define the function once.
|
|
||||||
if exists("*GetPythonIndent")
|
|
||||||
finish
|
|
||||||
endif
|
|
||||||
|
|
||||||
" Come here when loading the script the first time.
|
|
||||||
|
|
||||||
let s:maxoff = 50 " maximum number of lines to look backwards for ()
|
|
||||||
|
|
||||||
|
|
||||||
function GetPythonParenContinue(lnum3)
|
|
||||||
call cursor(a:lnum3,1)
|
|
||||||
|
|
||||||
|
|
||||||
"JMC
|
|
||||||
let pnum2 = searchpair('(\|{\|\[', '', ')\|}\|\]', 'rnbW',
|
|
||||||
\ "line('.') < " . (a:lnum3 - s:maxoff) . " ? dummy :"
|
|
||||||
\ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
|
|
||||||
\ . " =~ '\\(Comment\\|String\\)$'")
|
|
||||||
|
|
||||||
if pnum2 > 0
|
|
||||||
let g:linecont = 1
|
|
||||||
return pnum2
|
|
||||||
else
|
|
||||||
return a:lnum3
|
|
||||||
endif
|
|
||||||
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
|
|
||||||
function GetPythonExplicitContinue(lnum2)
|
|
||||||
|
|
||||||
let i = 1
|
|
||||||
let ret_lnum = a:lnum2
|
|
||||||
|
|
||||||
while (getline(a:lnum2 - i) =~ '\\\s*$')
|
|
||||||
let g:linecont = 1
|
|
||||||
let ret_lnum = a:lnum2 - i
|
|
||||||
let i = i + 1
|
|
||||||
endwhile
|
|
||||||
|
|
||||||
return ret_lnum
|
|
||||||
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function GetPythonIndent(lnum)
|
|
||||||
|
|
||||||
" " If this line is explicitly joined: If the previous line was also joined,
|
|
||||||
"" line it up with that one, otherwise add two 'shiftwidth'
|
|
||||||
"if getline(a:lnum - 1) =~ '\\$'
|
|
||||||
"if a:lnum > 1 && getline(a:lnum - 2) =~ '\\\s*$'
|
|
||||||
"return indent(a:lnum - 1)
|
|
||||||
"endif
|
|
||||||
"return indent(a:lnum - 1) + (exists("g:pyindent_continue") ? eval(g:pyindent_continue) : (&sw * 2))
|
|
||||||
"endif
|
|
||||||
|
|
||||||
" If the start of the line is in a string don't change the indent.
|
|
||||||
if has('syntax_items')
|
|
||||||
\ && synIDattr(synID(a:lnum, 1, 1), "name") =~ "String$"
|
|
||||||
return -1
|
|
||||||
endif
|
|
||||||
|
|
||||||
" Search backwards for the previous non-empty line.
|
|
||||||
let plnum = prevnonblank(v:lnum - 1)
|
|
||||||
|
|
||||||
if plnum == 0
|
|
||||||
" This is the first non-empty line, use zero indent.
|
|
||||||
return 0
|
|
||||||
endif
|
|
||||||
|
|
||||||
" If the previous line is inside parenthesis, use the indent of the starting
|
|
||||||
" line.
|
|
||||||
" Trick: use the non-existing "dummy" variable to break out of the loop when
|
|
||||||
" going too far back.
|
|
||||||
call cursor(plnum, 1)
|
|
||||||
|
|
||||||
"JMC
|
|
||||||
" let parlnum = searchpair('(\|{\|\[', '', ')\|}\|\]', 'rnbW',
|
|
||||||
"\ "line('.') < " . (plnum - s:maxoff) . " ? dummy :"
|
|
||||||
"\ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
|
|
||||||
"\ . " =~ '\\(Comment\\|String\\)$'")
|
|
||||||
let parlnumcomp = 0
|
|
||||||
let parlnum = plnum
|
|
||||||
while (parlnumcomp != parlnum)
|
|
||||||
let parlnumcomp = parlnum
|
|
||||||
let parlnum = GetPythonParenContinue(parlnum)
|
|
||||||
let parlnum = GetPythonExplicitContinue(parlnum)
|
|
||||||
endwhile
|
|
||||||
" If this line is explicitly joined: If the previous line was also joined,
|
|
||||||
" line it up with that one, otherwise add two 'shiftwidth'
|
|
||||||
if getline(plnum) =~ '\\$'
|
|
||||||
return indent(parlnum) + (&sw * 2)
|
|
||||||
else
|
|
||||||
let plindent = indent(parlnum)
|
|
||||||
endif
|
|
||||||
|
|
||||||
let plnumstart = parlnum
|
|
||||||
|
|
||||||
" When inside parenthesis: If at the first line below the parenthesis add
|
|
||||||
" two 'shiftwidth', otherwise same as previous line.
|
|
||||||
" i = (a
|
|
||||||
" + b
|
|
||||||
" + c)
|
|
||||||
call cursor(a:lnum, 1)
|
|
||||||
" JMC, changed to searchpairpos
|
|
||||||
let [p,parcol] = searchpairpos('(\|{\|\[', '', ')\|}\|\]', 'bW',
|
|
||||||
\ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :"
|
|
||||||
\ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
|
|
||||||
\ . " =~ '\\(Comment\\|String\\)$'")
|
|
||||||
if p > 0
|
|
||||||
"if p == plnum
|
|
||||||
" JMC
|
|
||||||
" let [pp,parcol2] = searchpairpos('(\|{\|\[', '', ')\|}\|\]', 'bW',
|
|
||||||
"\ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :"
|
|
||||||
"\ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
|
|
||||||
"\ . " =~ '\\(Comment\\|String\\)$'")
|
|
||||||
"if pp > 0
|
|
||||||
"return indent(plnum) + (exists("g:pyindent_nested_paren") ? eval(g:pyindent_nested_paren) : parcol2)
|
|
||||||
"endif
|
|
||||||
|
|
||||||
" JMC, changed to return column position, unless specifically asked
|
|
||||||
" otherwise
|
|
||||||
"return indent(plnum) + (exists("g:pyindent_open_paren") ? eval(g:pyindent_open_paren) : (&sw * 2))
|
|
||||||
return (exists("g:pyindent_open_paren") ? indent(p) + eval(g:pyindent_open_paren) : parcol)
|
|
||||||
"endif
|
|
||||||
"if plnumstart == p
|
|
||||||
"return parcol
|
|
||||||
"endif
|
|
||||||
"return plindent
|
|
||||||
endif
|
|
||||||
|
|
||||||
|
|
||||||
" Get the line and remove a trailing comment.
|
|
||||||
" Use syntax highlighting attributes when possible.
|
|
||||||
let pline = getline(plnum)
|
|
||||||
let pline_len = strlen(pline)
|
|
||||||
if has('syntax_items')
|
|
||||||
" If the last character in the line is a comment, do a binary search for
|
|
||||||
" the start of the comment. synID() is slow, a linear search would take
|
|
||||||
" too long on a long line.
|
|
||||||
if synIDattr(synID(plnum, pline_len, 1), "name") =~ "Comment$"
|
|
||||||
let min = 1
|
|
||||||
let max = pline_len
|
|
||||||
while min < max
|
|
||||||
let col = (min + max) / 2
|
|
||||||
if synIDattr(synID(plnum, col, 1), "name") =~ "Comment$"
|
|
||||||
let max = col
|
|
||||||
else
|
|
||||||
let min = col + 1
|
|
||||||
endif
|
|
||||||
endwhile
|
|
||||||
let pline = strpart(pline, 0, min - 1)
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
let col = 0
|
|
||||||
while col < pline_len
|
|
||||||
if pline[col] == '#'
|
|
||||||
let pline = strpart(pline, 0, col)
|
|
||||||
break
|
|
||||||
endif
|
|
||||||
let col = col + 1
|
|
||||||
endwhile
|
|
||||||
endif
|
|
||||||
|
|
||||||
" If the previous line ended with a colon, indent this line
|
|
||||||
if pline =~ ':\s*$'
|
|
||||||
" commented because it might not be a good idea:
|
|
||||||
" only for new lines
|
|
||||||
" JMC
|
|
||||||
"if (getline(a:lnum) =~ '^\s*$')
|
|
||||||
return plindent + &sw
|
|
||||||
"endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
" If the previous line was a stop-execution statement...
|
|
||||||
if getline(plnum) =~ '^\s*\(break\|continue\|raise\|return\|pass\)\>'
|
|
||||||
" See if the user has already dedented
|
|
||||||
if indent(a:lnum) > indent(plnum) - &sw
|
|
||||||
" If not, recommend one dedent
|
|
||||||
return indent(plnum) - &sw
|
|
||||||
endif
|
|
||||||
" Otherwise, trust the user
|
|
||||||
return -1
|
|
||||||
endif
|
|
||||||
|
|
||||||
" If the current line begins with a keyword that lines up with "try"
|
|
||||||
if getline(a:lnum) =~ '^\s*\(except\|finally\)\>'
|
|
||||||
let lnum = a:lnum - 1
|
|
||||||
while lnum >= 1
|
|
||||||
if getline(lnum) =~ '^\s*\(try\|except\)\>'
|
|
||||||
let ind = indent(lnum)
|
|
||||||
if ind >= indent(a:lnum)
|
|
||||||
return -1 " indent is already less than this
|
|
||||||
endif
|
|
||||||
return ind " line up with previous try or except
|
|
||||||
endif
|
|
||||||
let lnum = lnum - 1
|
|
||||||
endwhile
|
|
||||||
return -1 " no matching "try"!
|
|
||||||
endif
|
|
||||||
|
|
||||||
" If the current line begins with a header keyword, dedent
|
|
||||||
if getline(a:lnum) =~ '^\s*\(elif\|else\)\>'
|
|
||||||
|
|
||||||
" Unless the previous line was a one-liner
|
|
||||||
if getline(plnumstart) =~ '^\s*\(for\|if\|try\)\>'
|
|
||||||
return plindent
|
|
||||||
endif
|
|
||||||
|
|
||||||
" Or the user has already dedented
|
|
||||||
if indent(a:lnum) <= plindent - &sw
|
|
||||||
return -1
|
|
||||||
endif
|
|
||||||
|
|
||||||
return plindent - &sw
|
|
||||||
endif
|
|
||||||
|
|
||||||
" JMC
|
|
||||||
" If the previous line is a continuation
|
|
||||||
" make the next line line up, but only for new lines
|
|
||||||
"let curline = getline(a:lnum)
|
|
||||||
if (g:linecont == 1)
|
|
||||||
if (getline(a:lnum) =~ '^\s*$')
|
|
||||||
return plindent
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
" JMC commented
|
|
||||||
" When after a () construct we probably want to go back to the start line.
|
|
||||||
" a = (b
|
|
||||||
" + c)
|
|
||||||
" here
|
|
||||||
"if parlnum > 0
|
|
||||||
"return plindent
|
|
||||||
"endif
|
|
||||||
|
|
||||||
return -1
|
|
||||||
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" vim:sw=2
|
|
||||||
|
|||||||
262
indent/python_pep8.vim
Normal file
262
indent/python_pep8.vim
Normal file
@@ -0,0 +1,262 @@
|
|||||||
|
" Vim indent file
|
||||||
|
" Language: Python
|
||||||
|
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
||||||
|
" Original Author: David Bustos <bustos@caltech.edu>
|
||||||
|
" Last Change: 2008 Mar 14
|
||||||
|
" Changed my Jason Casden to try to prettify the line continuations
|
||||||
|
|
||||||
|
" Only load this indent file when no other was loaded.
|
||||||
|
if exists("b:did_indent")
|
||||||
|
finish
|
||||||
|
endif
|
||||||
|
let b:did_indent = 1
|
||||||
|
let g:linecont = 0
|
||||||
|
|
||||||
|
" Some preliminary settings
|
||||||
|
setlocal nolisp " Make sure lisp indenting doesn't supersede us
|
||||||
|
setlocal autoindent " indentexpr isn't much help otherwise
|
||||||
|
|
||||||
|
setlocal indentexpr=GetPythonIndent(v:lnum)
|
||||||
|
setlocal indentkeys+=<:>,=elif,=except
|
||||||
|
|
||||||
|
" Only define the function once.
|
||||||
|
if exists("*GetPythonIndent")
|
||||||
|
finish
|
||||||
|
endif
|
||||||
|
|
||||||
|
" Come here when loading the script the first time.
|
||||||
|
|
||||||
|
let s:maxoff = 50 " maximum number of lines to look backwards for ()
|
||||||
|
|
||||||
|
|
||||||
|
function GetPythonParenContinue(lnum3)
|
||||||
|
call cursor(a:lnum3,1)
|
||||||
|
|
||||||
|
|
||||||
|
"JMC
|
||||||
|
let pnum2 = searchpair('(\|{\|\[', '', ')\|}\|\]', 'rnbW',
|
||||||
|
\ "line('.') < " . (a:lnum3 - s:maxoff) . " ? dummy :"
|
||||||
|
\ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
|
||||||
|
\ . " =~ '\\(Comment\\|String\\)$'")
|
||||||
|
|
||||||
|
if pnum2 > 0
|
||||||
|
let g:linecont = 1
|
||||||
|
return pnum2
|
||||||
|
else
|
||||||
|
return a:lnum3
|
||||||
|
endif
|
||||||
|
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
|
||||||
|
function GetPythonExplicitContinue(lnum2)
|
||||||
|
|
||||||
|
let i = 1
|
||||||
|
let ret_lnum = a:lnum2
|
||||||
|
|
||||||
|
while (getline(a:lnum2 - i) =~ '\\\s*$')
|
||||||
|
let g:linecont = 1
|
||||||
|
let ret_lnum = a:lnum2 - i
|
||||||
|
let i = i + 1
|
||||||
|
endwhile
|
||||||
|
|
||||||
|
return ret_lnum
|
||||||
|
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function GetPythonIndent(lnum)
|
||||||
|
|
||||||
|
" " If this line is explicitly joined: If the previous line was also joined,
|
||||||
|
"" line it up with that one, otherwise add two 'shiftwidth'
|
||||||
|
"if getline(a:lnum - 1) =~ '\\$'
|
||||||
|
"if a:lnum > 1 && getline(a:lnum - 2) =~ '\\\s*$'
|
||||||
|
"return indent(a:lnum - 1)
|
||||||
|
"endif
|
||||||
|
"return indent(a:lnum - 1) + (exists("g:pyindent_continue") ? eval(g:pyindent_continue) : (&sw * 2))
|
||||||
|
"endif
|
||||||
|
|
||||||
|
" If the start of the line is in a string don't change the indent.
|
||||||
|
if has('syntax_items')
|
||||||
|
\ && synIDattr(synID(a:lnum, 1, 1), "name") =~ "String$"
|
||||||
|
return -1
|
||||||
|
endif
|
||||||
|
|
||||||
|
" Search backwards for the previous non-empty line.
|
||||||
|
let plnum = prevnonblank(v:lnum - 1)
|
||||||
|
|
||||||
|
if plnum == 0
|
||||||
|
" This is the first non-empty line, use zero indent.
|
||||||
|
return 0
|
||||||
|
endif
|
||||||
|
|
||||||
|
" If the previous line is inside parenthesis, use the indent of the starting
|
||||||
|
" line.
|
||||||
|
" Trick: use the non-existing "dummy" variable to break out of the loop when
|
||||||
|
" going too far back.
|
||||||
|
call cursor(plnum, 1)
|
||||||
|
|
||||||
|
"JMC
|
||||||
|
" let parlnum = searchpair('(\|{\|\[', '', ')\|}\|\]', 'rnbW',
|
||||||
|
"\ "line('.') < " . (plnum - s:maxoff) . " ? dummy :"
|
||||||
|
"\ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
|
||||||
|
"\ . " =~ '\\(Comment\\|String\\)$'")
|
||||||
|
let parlnumcomp = 0
|
||||||
|
let parlnum = plnum
|
||||||
|
while (parlnumcomp != parlnum)
|
||||||
|
let parlnumcomp = parlnum
|
||||||
|
let parlnum = GetPythonParenContinue(parlnum)
|
||||||
|
let parlnum = GetPythonExplicitContinue(parlnum)
|
||||||
|
endwhile
|
||||||
|
" If this line is explicitly joined: If the previous line was also joined,
|
||||||
|
" line it up with that one, otherwise add two 'shiftwidth'
|
||||||
|
if getline(plnum) =~ '\\$'
|
||||||
|
return indent(parlnum) + (&sw * 2)
|
||||||
|
else
|
||||||
|
let plindent = indent(parlnum)
|
||||||
|
endif
|
||||||
|
|
||||||
|
let plnumstart = parlnum
|
||||||
|
|
||||||
|
" When inside parenthesis: If at the first line below the parenthesis add
|
||||||
|
" two 'shiftwidth', otherwise same as previous line.
|
||||||
|
" i = (a
|
||||||
|
" + b
|
||||||
|
" + c)
|
||||||
|
call cursor(a:lnum, 1)
|
||||||
|
" JMC, changed to searchpairpos
|
||||||
|
let [p,parcol] = searchpairpos('(\|{\|\[', '', ')\|}\|\]', 'bW',
|
||||||
|
\ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :"
|
||||||
|
\ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
|
||||||
|
\ . " =~ '\\(Comment\\|String\\)$'")
|
||||||
|
if p > 0
|
||||||
|
"if p == plnum
|
||||||
|
" JMC
|
||||||
|
" let [pp,parcol2] = searchpairpos('(\|{\|\[', '', ')\|}\|\]', 'bW',
|
||||||
|
"\ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :"
|
||||||
|
"\ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
|
||||||
|
"\ . " =~ '\\(Comment\\|String\\)$'")
|
||||||
|
"if pp > 0
|
||||||
|
"return indent(plnum) + (exists("g:pyindent_nested_paren") ? eval(g:pyindent_nested_paren) : parcol2)
|
||||||
|
"endif
|
||||||
|
|
||||||
|
" JMC, changed to return column position, unless specifically asked
|
||||||
|
" otherwise
|
||||||
|
"return indent(plnum) + (exists("g:pyindent_open_paren") ? eval(g:pyindent_open_paren) : (&sw * 2))
|
||||||
|
return (exists("g:pyindent_open_paren") ? indent(p) + eval(g:pyindent_open_paren) : parcol)
|
||||||
|
"endif
|
||||||
|
"if plnumstart == p
|
||||||
|
"return parcol
|
||||||
|
"endif
|
||||||
|
"return plindent
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
" Get the line and remove a trailing comment.
|
||||||
|
" Use syntax highlighting attributes when possible.
|
||||||
|
let pline = getline(plnum)
|
||||||
|
let pline_len = strlen(pline)
|
||||||
|
if has('syntax_items')
|
||||||
|
" If the last character in the line is a comment, do a binary search for
|
||||||
|
" the start of the comment. synID() is slow, a linear search would take
|
||||||
|
" too long on a long line.
|
||||||
|
if synIDattr(synID(plnum, pline_len, 1), "name") =~ "Comment$"
|
||||||
|
let min = 1
|
||||||
|
let max = pline_len
|
||||||
|
while min < max
|
||||||
|
let col = (min + max) / 2
|
||||||
|
if synIDattr(synID(plnum, col, 1), "name") =~ "Comment$"
|
||||||
|
let max = col
|
||||||
|
else
|
||||||
|
let min = col + 1
|
||||||
|
endif
|
||||||
|
endwhile
|
||||||
|
let pline = strpart(pline, 0, min - 1)
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
let col = 0
|
||||||
|
while col < pline_len
|
||||||
|
if pline[col] == '#'
|
||||||
|
let pline = strpart(pline, 0, col)
|
||||||
|
break
|
||||||
|
endif
|
||||||
|
let col = col + 1
|
||||||
|
endwhile
|
||||||
|
endif
|
||||||
|
|
||||||
|
" If the previous line ended with a colon, indent this line
|
||||||
|
if pline =~ ':\s*$'
|
||||||
|
" commented because it might not be a good idea:
|
||||||
|
" only for new lines
|
||||||
|
" JMC
|
||||||
|
"if (getline(a:lnum) =~ '^\s*$')
|
||||||
|
return plindent + &sw
|
||||||
|
"endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
" If the previous line was a stop-execution statement...
|
||||||
|
if getline(plnum) =~ '^\s*\(break\|continue\|raise\|return\|pass\)\>'
|
||||||
|
" See if the user has already dedented
|
||||||
|
if indent(a:lnum) > indent(plnum) - &sw
|
||||||
|
" If not, recommend one dedent
|
||||||
|
return indent(plnum) - &sw
|
||||||
|
endif
|
||||||
|
" Otherwise, trust the user
|
||||||
|
return -1
|
||||||
|
endif
|
||||||
|
|
||||||
|
" If the current line begins with a keyword that lines up with "try"
|
||||||
|
if getline(a:lnum) =~ '^\s*\(except\|finally\)\>'
|
||||||
|
let lnum = a:lnum - 1
|
||||||
|
while lnum >= 1
|
||||||
|
if getline(lnum) =~ '^\s*\(try\|except\)\>'
|
||||||
|
let ind = indent(lnum)
|
||||||
|
if ind >= indent(a:lnum)
|
||||||
|
return -1 " indent is already less than this
|
||||||
|
endif
|
||||||
|
return ind " line up with previous try or except
|
||||||
|
endif
|
||||||
|
let lnum = lnum - 1
|
||||||
|
endwhile
|
||||||
|
return -1 " no matching "try"!
|
||||||
|
endif
|
||||||
|
|
||||||
|
" If the current line begins with a header keyword, dedent
|
||||||
|
if getline(a:lnum) =~ '^\s*\(elif\|else\)\>'
|
||||||
|
|
||||||
|
" Unless the previous line was a one-liner
|
||||||
|
if getline(plnumstart) =~ '^\s*\(for\|if\|try\)\>'
|
||||||
|
return plindent
|
||||||
|
endif
|
||||||
|
|
||||||
|
" Or the user has already dedented
|
||||||
|
if indent(a:lnum) <= plindent - &sw
|
||||||
|
return -1
|
||||||
|
endif
|
||||||
|
|
||||||
|
return plindent - &sw
|
||||||
|
endif
|
||||||
|
|
||||||
|
" JMC
|
||||||
|
" If the previous line is a continuation
|
||||||
|
" make the next line line up, but only for new lines
|
||||||
|
"let curline = getline(a:lnum)
|
||||||
|
if (g:linecont == 1)
|
||||||
|
if (getline(a:lnum) =~ '^\s*$')
|
||||||
|
return plindent
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
" JMC commented
|
||||||
|
" When after a () construct we probably want to go back to the start line.
|
||||||
|
" a = (b
|
||||||
|
" + c)
|
||||||
|
" here
|
||||||
|
"if parlnum > 0
|
||||||
|
"return plindent
|
||||||
|
"endif
|
||||||
|
|
||||||
|
return -1
|
||||||
|
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
" vim:sw=2
|
||||||
@@ -48,8 +48,10 @@ snippet subject
|
|||||||
:Subject: ${1}
|
:Subject: ${1}
|
||||||
snippet code
|
snippet code
|
||||||
.. sourcecode:: ${1:python}
|
.. sourcecode:: ${1:python}
|
||||||
|
:cssclass: ${2:wombat}
|
||||||
|
${3::linenos:} ${4:1}
|
||||||
|
|
||||||
${2}
|
${5}
|
||||||
snippet figure
|
snippet figure
|
||||||
.. figure:: ${1:image.png}
|
.. figure:: ${1:image.png}
|
||||||
:target: $1
|
:target: $1
|
||||||
@@ -66,3 +68,7 @@ snippet article
|
|||||||
${5}
|
${5}
|
||||||
|
|
||||||
.. more
|
.. more
|
||||||
|
snippet raw
|
||||||
|
.. raw:: html
|
||||||
|
|
||||||
|
${1}
|
||||||
|
|||||||
Reference in New Issue
Block a user