VimPlug/jedi-vim
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi-vim.git synced 2025-12-08 19:44:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not overwrite/re-define pythonString syntax regions

Browse Source 
Use `containedin` instead with `jediFunction`.
This commit is contained in:
Daniel Hahler
2015-03-03 12:59:52 +01:00
parent 59c98d61cf
commit b6bef9a056
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
after/syntax/python.vim
View File

@@ -9,7 +9,9 @@ if g:jedi#show_call_signatures > 0 && has('conceal')
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 "'.s:l1.'" keepend extend contains=jediIgnore,jediFat,jediSpace' exe 'syn match jediFunction "'.s:l1.'" keepend extend '
\ .' contains=jediIgnore,jediFat,jediSpace'
\ .' containedin=pythonComment,pythonString,pythonRawString'
unlet! s:e s:l1 s:l2 unlet! s:e s:l1 s:l2
hi def link jediIgnore Ignore hi def link jediIgnore Ignore
@@ -23,19 +25,4 @@ if g:jedi#show_call_signatures > 0 && has('conceal')
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)
syn match pythonComment "#.*$" contains=pythonTodo,@Spell,jediFunction
syn region pythonString
\ start=+[uU]\=\z(['"]\)+ end="\z1" skip="\\\\\|\\\z1"
\ contains=pythonEscape,@Spell,jediFunction
syn region pythonString
\ start=+[uU]\=\z('''\|"""\)+ end="\z1" keepend
\ contains=pythonEscape,pythonSpaceError,pythonDoctest,@Spell,jediFunction
syn region pythonRawString
\ start=+[uU]\=[rR]\z(['"]\)+ end="\z1" skip="\\\\\|\\\z1"
\ contains=@Spell,jediFunction
syn region pythonRawString
\ start=+[uU]\=[rR]\z('''\|"""\)+ end="\z1" keepend
\ contains=pythonSpaceError,pythonDoctest,@Spell,jediFunction
endif endif