From: Daniel Hahler <git@thequod.de>
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=sidebyside;hp=-c;pf=etc

Merge branch 'master' into searchpair-timeout

Conflicts:
	indent/python.vim
---

c2e53f8cab69594b3fffbbdcbbe38acafdb7ca19
diff --combined indent/python.vim
index b053083,4b39609..5da97e9
--- a/indent/python.vim
+++ b/indent/python.vim
@@@ -38,15 -38,6 +38,15 @@@ if !exists('g:python_pep8_indent_hang_c
      let g:python_pep8_indent_hang_closing = 0
  endif
  
 +" TODO: check required patch for timeout argument, likely lower than 7.3.429 though.
 +if !exists('g:python_pep8_indent_searchpair_timeout')
 +    if has('patch-8.0.1483')
 +        let g:python_pep8_indent_searchpair_timeout = 150
 +    else
 +        let g:python_pep8_indent_searchpair_timeout = 0
 +    endif
 +endif
 +
  let s:block_rules = {
              \ '^\s*elif\>': ['if', 'elif'],
              \ '^\s*except\>': ['try', 'except'],
@@@ -66,36 -57,26 +66,35 @@@ els
  endif
  let s:stop_statement = '^\s*\(break\|continue\|raise\|return\|pass\)\>'
  
 -" 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.
 -let s:skip_special_chars = 'synIDattr(synID(line("."), col("."), 0), "name") ' .
 -            \ '=~? "\\vstring|comment|^pythonbytes%(contents)=$|jedi\\S"'
 -
  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')
@@@ -118,12 -99,10 +117,12 @@@ function! s:find_opening_paren(lnum, co
      call cursor(a:lnum, a:col)
  
      let nearest = [0, 0]
 +    let timeout = g:python_pep8_indent_searchpair_timeout
 +    let skip_special_chars = 's:_skip_special_chars(line("."), col("."))'
      for [p, maxoff] in items(s:paren_pairs)
          let stopline = max([0, line('.') - maxoff, nearest[0]])
          let next = searchpairpos(
 -           \ '\V'.p[0], '', '\V'.p[1], 'bnW', s:skip_special_chars, stopline)
 +           \ '\V'.p[0], '', '\V'.p[1], 'bnW', skip_special_chars, stopline, timeout)
          if next[0] && (next[0] > nearest[0] || (next[0] == nearest[0] && next[1] > nearest[1]))
              let nearest = next
          endif
@@@ -278,23 -257,24 +277,23 @@@ function! s:indent_like_previous_line(l
      let base = indent(start)
      let current = indent(a:lnum)
  
 -    " Jump to last character in previous line.
 -    call cursor(lnum, len(text))
 -    let ignore_last_char = eval(s:skip_special_chars)
 +    " Ignore last character in previous line?
 +    let lastcol = len(text)
 +    let col = lastcol
  
      " Search for final colon that is not inside something to be ignored.
      while 1
 -        let curpos = getpos('.')[2]
 -        if curpos == 1 | break | endif
 -        if eval(s:skip_special_chars) || text[curpos-1] =~# '\s'
 -            normal! h
 +        if col == 1 | break | endif
 +        if text[col-1] =~# '\s' || s:_skip_special_chars(lnum, col)
 +            let col = col - 1
              continue
 -        elseif text[curpos-1] ==# ':'
 +        elseif text[col-1] ==# ':'
              return base + s:sw()
          endif
          break
      endwhile
  
 -    if text =~# '\\$' && !ignore_last_char
 +    if text =~# '\\$' && !s:_skip_special_chars(lnum, lastcol)
          " If this line is the continuation of a control statement
          " indent further to distinguish the continuation line
          " from the next logical line.
@@@ -376,12 -356,11 +375,12 @@@ function! GetPythonPEPIndent(lnum
          if match_quotes != -1
              " closing multiline string
              let quotes = line[match_quotes:(match_quotes+2)]
 -            let pairpos = searchpairpos(quotes, '', quotes, 'b')
 +            call cursor(a:lnum, 1)
 +            let pairpos = searchpairpos(quotes, '', quotes, 'bW', '', 0, g:python_pep8_indent_searchpair_timeout)
              if pairpos[0] != 0
                  return indent(pairpos[0])
              else
 -                " TODO: test to cover this!
 +                return -1
              endif
          endif