From: Daniel Hahler Date: Fri, 17 Nov 2017 13:58:22 +0000 (+0100) Subject: Revert "Improve s:find_start_of_multiline_statement: only look for round parens"... X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/5f4184fb1200b329e810c1e4c866c86fdf44c135?ds=sidebyside Revert "Improve s:find_start_of_multiline_statement: only look for round parens" (#95) This reverts commit 922268fbd89a49991b5b5b73e969f8daa8a10263. Add a regression test. Conflicts: indent/python.vim --- diff --git a/indent/python.vim b/indent/python.vim index e251ce2..86155cf 100644 --- a/indent/python.vim +++ b/indent/python.vim @@ -46,9 +46,6 @@ let s:block_rules_multiple = { " The value is the maximum offset in lines. let s:paren_pairs = {'()': 50, '[]': 100, '{}': 1000} -" Maximum offset when looking for multiline statements (in round parenthesis). -let s:maxoff_multiline_statement = 50 - if &filetype ==# 'pyrex' || &filetype ==# 'cython' let b:control_statement = '\v^\s*(class|def|if|while|with|for|except|cdef|cpdef)>' else @@ -125,21 +122,19 @@ function! s:find_opening_paren(...) return nearest endfunction -" Find the start of a multi-line statement (based on surrounding parens). +" Find the start of a multi-line statement function! s:find_start_of_multiline_statement(lnum) let lnum = a:lnum while lnum > 0 - " XXX: not tested?! if getline(lnum - 1) =~# '\\$' let lnum = prevnonblank(lnum - 1) else - call cursor(lnum, 1) - let stopline = max([1, lnum - s:maxoff_multiline_statement]) - let pos = searchpairpos('\V(', '', '\V)', 'bnW', s:skip_special_chars, stopline) - if pos[0] - return pos[0] + let [paren_lnum, _] = s:find_opening_paren(lnum) + if paren_lnum < 1 + return lnum + else + let lnum = paren_lnum endif - return lnum endif endwhile endfunction diff --git a/spec/indent/indent_spec.rb b/spec/indent/indent_spec.rb index b08203b..6e5a79f 100644 --- a/spec/indent/indent_spec.rb +++ b/spec/indent/indent_spec.rb @@ -651,3 +651,18 @@ describe "Handles far away opening curly brackets" do indent.should == shiftwidth end end + +describe "Compact multiline dict" do + before { vim.feedkeys '\ggdGid = {"one": 1,' } + + it "gets indented correctly" do + vim.feedkeys '\' + proposed_indent.should == 5 + + vim.feedkeys '"two": 2}' + proposed_indent.should == 5 + + vim.feedkeys '\' + proposed_indent.should == 0 + end +end