From: Daniel Hahler Date: Sat, 17 Nov 2018 18:39:10 +0000 (+0100) Subject: Merge branch 'master' into searchpair-timeout X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/61e1c4d6a5c90ba0222cd58198ccc0232433f90c?ds=inline;hp=-c Merge branch 'master' into searchpair-timeout --- 61e1c4d6a5c90ba0222cd58198ccc0232433f90c diff --combined indent/python.vim index b5ea8a9,6f84637..977ec05 --- 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,35 -57,28 +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 -let s:skip_search = 'synIDattr(synID(line("."), col("."), 0), "name") ' . - \ '=~? "comment"' " Use 'shiftwidth()' instead of '&sw'. " (Since Vim patch 7.3.629, 'shiftwidth' can be set to 0 to follow 'tabstop'). @@@ -109,26 -93,24 +109,26 @@@ els endif " Find backwards the closest open parenthesis/bracket/brace. -function! s:find_opening_paren(...) - " optional arguments: line and column (defaults to 1) to search around - if a:0 > 0 - let view = winsaveview() - call cursor(a:1, a:0 > 1 ? a:2 : 1) - let ret = s:find_opening_paren() - call winrestview(view) - return ret +function! s:find_opening_paren(lnum, col) + " Return if cursor is in a comment. + if synIDattr(synID(a:lnum, a:col, 0), 'name') =~? 'comment' + return [0, 0] endif - " Return if cursor is in a comment. - exe 'if' s:skip_search '| return [0, 0] | endif' + call cursor(a:lnum, a:col) let nearest = [0, 0] + let timeout = g:python_pep8_indent_searchpair_timeout 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) + let found = 0 + while 1 + let next = searchpairpos('\V'.p[0], '', '\V'.p[1], 'bnW', '', stopline, timeout) + if !next[0] || !s:_skip_special_chars(next[0], next[1]) + break + endif + call cursor(next[0], next[1]) + endwhile if next[0] && (next[0] > nearest[0] || (next[0] == nearest[0] && next[1] > nearest[1])) let nearest = next endif @@@ -143,7 -125,7 +143,7 @@@ function! s:find_start_of_multiline_sta if getline(lnum - 1) =~# '\\$' let lnum = prevnonblank(lnum - 1) else - let [paren_lnum, _] = s:find_opening_paren(lnum) + let [paren_lnum, _] = s:find_opening_paren(lnum, 1) if paren_lnum < 1 return lnum else @@@ -200,7 -182,7 +200,7 @@@ endfunctio " Line up with open parenthesis/bracket/brace. function! s:indent_like_opening_paren(lnum) - let [paren_lnum, paren_col] = s:find_opening_paren(a:lnum) + let [paren_lnum, paren_col] = s:find_opening_paren(a:lnum, 1) if paren_lnum <= 0 return -2 endif @@@ -230,7 -212,7 +230,7 @@@ " from the next logical line. if text =~# b:control_statement && res == base + s:sw() " But only if not inside parens itself (Flake's E127). - let [paren_lnum, _] = s:find_opening_paren(paren_lnum) + let [paren_lnum, _] = s:find_opening_paren(paren_lnum, 1) if paren_lnum <= 0 return res + s:sw() endif @@@ -283,23 -265,24 +283,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. @@@ -330,7 -313,7 +330,7 @@@ return -1 endif - if !empty && s:is_dedented_already(current, base) + if (current || !empty) && s:is_dedented_already(current, base) return -1 endif @@@ -381,12 -364,11 +381,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 diff --combined spec/indent/indent_spec.rb index 68b545f,aa796df..9c52235 --- a/spec/indent/indent_spec.rb +++ b/spec/indent/indent_spec.rb @@@ -502,26 -502,11 +502,26 @@@ shared_examples_for "multiline strings end describe "when after a docstring" do - before { vim.feedkeys 'i """' } it "it does indent the next line to the docstring" do - vim.feedkeys '\' + vim.feedkeys 'i """\' + indent.should == 4 + proposed_indent.should == 4 + end + + it "indents the closing docstring quotes" do + vim.feedkeys 'i """\\"""' indent.should == 4 proposed_indent.should == 4 + vim.echo('getline(3)').should == ' """' + end + + it "indents non-matching docstring quotes" do + vim.feedkeys 'i """\\' + vim.feedkeys "0C'''" + vim.echo('line(".")').should == "4" + vim.echo('getline(".")').should == "'''" + indent.should == 0 + proposed_indent.should == -1 end end @@@ -700,3 -685,22 +700,22 @@@ describe "Compact multiline dict" d proposed_indent.should == 0 end end + + describe "Using O" do + before { vim.feedkeys 'iif foo:\' } + + it "respects autoindent" do + vim.feedkeys '1\\' + indent.should == shiftwidth + vim.feedkeys '\ko' + indent.should == shiftwidth + vim.feedkeys '\kO' + indent.should == shiftwidth + # Uses/keeps indent from line above + vim.feedkeys '\i2\O' + indent.should == shiftwidth + # Uses/keeps indent from line above + vim.feedkeys '\j\O' + indent.should == 0 + end + end