indentation

This commit is contained in:
David Halter
2013-08-28 22:38:00 +04:30
parent d85413feaa
commit 81b752f606

View File

@@ -1,40 +1,40 @@
if g:jedi#show_call_signatures == 1 && has('conceal') if g:jedi#show_call_signatures == 1 && has('conceal')
" conceal is normal for vim >= 7.3 " conceal is normal for vim >= 7.3
let e = g:jedi#call_signature_escape let e = g:jedi#call_signature_escape
let l1 = e.'jedi=[^'.e.']*'.e.'[^'.e.']*'.e.'jedi'.e let l1 = e.'jedi=[^'.e.']*'.e.'[^'.e.']*'.e.'jedi'.e
let l2 = e.'jedi=\?[^'.e.']*'.e let l2 = e.'jedi=\?[^'.e.']*'.e
exe 'syn match jediIgnore "'.l2.'" contained conceal' exe 'syn match jediIgnore "'.l2.'" contained conceal'
setlocal conceallevel=2 setlocal conceallevel=2
syn match jediFatSymbol "*" contained conceal syn match jediFatSymbol "*" contained conceal
syn match jediFat "\*[^*]\+\*" contained contains=jediFatSymbol syn match jediFat "\*[^*]\+\*" contained contains=jediFatSymbol
syn match jediSpace "\v[ ]+( )@=" contained syn match jediSpace "\v[ ]+( )@=" contained
exe 'syn match jediFunction "'.l1.'" keepend extend contains=jediIgnore,jediFat,jediSpace' exe 'syn match jediFunction "'.l1.'" keepend extend contains=jediIgnore,jediFat,jediSpace'
hi def link jediIgnore Ignore hi def link jediIgnore Ignore
hi def link jediFatSymbol Ignore hi def link jediFatSymbol Ignore
hi def link jediSpace Normal hi def link jediSpace Normal
if exists('g:colors_name') if exists('g:colors_name')
hi def link jediFunction CursorLine hi def link jediFunction CursorLine
hi def link jediFat TabLine hi def link jediFat TabLine
else else
hi jediFunction term=NONE cterm=NONE ctermfg=6 guifg=Black gui=NONE ctermbg=0 guibg=Grey hi jediFunction term=NONE cterm=NONE ctermfg=6 guifg=Black gui=NONE ctermbg=0 guibg=Grey
hi jediFat term=bold,underline cterm=bold,underline gui=bold,underline ctermbg=0 guibg=#555555 hi jediFat term=bold,underline cterm=bold,underline gui=bold,underline ctermbg=0 guibg=#555555
end end
" override defaults (add jediFunction to contains) " override defaults (add jediFunction to contains)
syn match pythonComment "#.*$" contains=pythonTodo,@Spell,jediFunction syn match pythonComment "#.*$" contains=pythonTodo,@Spell,jediFunction
syn region pythonString syn region pythonString
\ start=+[uU]\=\z(['"]\)+ end="\z1" skip="\\\\\|\\\z1" \ start=+[uU]\=\z(['"]\)+ end="\z1" skip="\\\\\|\\\z1"
\ contains=pythonEscape,@Spell,jediFunction \ contains=pythonEscape,@Spell,jediFunction
syn region pythonString syn region pythonString
\ start=+[uU]\=\z('''\|"""\)+ end="\z1" keepend \ start=+[uU]\=\z('''\|"""\)+ end="\z1" keepend
\ contains=pythonEscape,pythonSpaceError,pythonDoctest,@Spell,jediFunction \ contains=pythonEscape,pythonSpaceError,pythonDoctest,@Spell,jediFunction
syn region pythonRawString syn region pythonRawString
\ start=+[uU]\=[rR]\z(['"]\)+ end="\z1" skip="\\\\\|\\\z1" \ start=+[uU]\=[rR]\z(['"]\)+ end="\z1" skip="\\\\\|\\\z1"
\ contains=@Spell,jediFunction \ contains=@Spell,jediFunction
syn region pythonRawString syn region pythonRawString
\ start=+[uU]\=[rR]\z('''\|"""\)+ end="\z1" keepend \ start=+[uU]\=[rR]\z('''\|"""\)+ end="\z1" keepend
\ contains=pythonSpaceError,pythonDoctest,@Spell,jediFunction \ contains=pythonSpaceError,pythonDoctest,@Spell,jediFunction
endif endif