From: Daniel Hahler Date: Thu, 5 Oct 2017 21:12:24 +0000 (+0200) Subject: Intermediate fix for indenting huge dicts X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/d6c602fcad59f58df00dc86e2609c9791a19ba71?ds=inline Intermediate fix for indenting huge dicts This uses different offsets for the type of pairs: '()' and '[]' will only look for just 20 lines above, while 1000 lines are used for '{}', which might be a huge dict. Ref: https://github.com/Vimjas/vim-python-pep8-indent/pull/64. --- diff --git a/indent/python.vim b/indent/python.vim index 347e60d..b1ae8a2 100644 --- a/indent/python.vim +++ b/indent/python.vim @@ -34,7 +34,6 @@ if !exists('g:python_pep8_indent_multiline_string') let g:python_pep8_indent_multiline_string = 0 endif -let s:maxoff = 50 let s:block_rules = { \ '^\s*elif\>': ['if', 'elif'], \ '^\s*except\>': ['try', 'except'], @@ -43,7 +42,9 @@ let s:block_rules = { let s:block_rules_multiple = { \ '^\s*else\>': ['if', 'elif', 'for', 'try', 'except'], \ } -let s:paren_pairs = ['()', '{}', '[]'] +" Pairs to look for when searching for opening parenthesis. +" The value is the maximum offset in lines. +let s:paren_pairs = {'()': 10, '[]': 100, '{}': 1000} if &filetype ==# 'pyrex' || &filetype ==# 'cython' let b:control_statement = '\v^\s*(class|def|if|while|with|for|except|cdef|cpdef)>' else @@ -105,13 +106,12 @@ function! s:find_opening_paren(...) return ret endif - let stopline = max([0, line('.') - s:maxoff]) - " Return if cursor is in a comment. exe 'if' s:skip_search '| return [0, 0] | endif' let positions = [] - for p in s:paren_pairs + for [p, maxoff] in items(s:paren_pairs) + let stopline = max([0, line('.') - maxoff]) call add(positions, searchpairpos( \ '\V'.p[0], '', '\V'.p[1], 'bnW', s:skip_special_chars, stopline)) endfor