From: Daniel Hahler Date: Sun, 18 Nov 2018 11:00:33 +0000 (+0100) Subject: Merge branch 'master' into searchpair-timeout X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/c2e53f8cab69594b3fffbbdcbbe38acafdb7ca19?ds=inline;hp=--cc Merge branch 'master' into searchpair-timeout Conflicts: indent/python.vim --- c2e53f8cab69594b3fffbbdcbbe38acafdb7ca19 diff --cc indent/python.vim index b053083,4b39609..5da97e9 --- a/indent/python.vim +++ b/indent/python.vim @@@ -69,33 -60,23 +69,32 @@@ let s:stop_statement = '^\s*\(break\|co let s:skip_after_opening_paren = 'synIDattr(synID(line("."), col("."), 0), "name") ' . \ '=~? "\\vcomment|jedi\\S"' -" Also ignore anything concealed. -" Wrapper around synconcealed for older Vim (7.3.429, used on Travis CI). -function! s:is_concealed(line, col) - let concealed = synconcealed(a:line, a:col) - return len(concealed) && concealed[0] -endfunction -if has('conceal') - let s:skip_special_chars .= '|| s:is_concealed(line("."), col("."))' -endif +if !get(g:, 'python_pep8_indent_skip_concealed', 0) || !has('conceal') + " Skip strings and comments. Return 1 for chars to skip. + " jedi* refers to syntax definitions from jedi-vim for call signatures, which + " are inserted temporarily into the buffer. + function! s:_skip_special_chars(line, col) + return synIDattr(synID(a:line, a:col, 0), 'name') + \ =~? "\\vstring|comment|^pythonbytes%(contents)=$|jedi\\S" + endfunction +else + " Also ignore anything concealed. + " TODO: doc; likely only necessary with jedi-vim, where a better version is + " planned (https://github.com/Vimjas/vim-python-pep8-indent/pull/98). + + " Wrapper around synconcealed for older Vim (7.3.429, used on Travis CI). + function! s:is_concealed(line, col) + let concealed = synconcealed(a:line, a:col) + return len(concealed) && concealed[0] + endfunction + function! s:_skip_special_chars(line, col) + return synIDattr(synID(a:line, a:col, 0), 'name') + \ =~? "\\vstring|comment|^pythonbytes%(contents)=$|jedi\\S" + \ || s:is_concealed(a:line, a:col) + endfunction +endif - " Use 'shiftwidth()' instead of '&sw'. " (Since Vim patch 7.3.629, 'shiftwidth' can be set to 0 to follow 'tabstop'). if exists('*shiftwidth')