casraf/vim-matchup
1
0
Fork 0
mirror of https://github.com/chenasraf/vim-matchup.git synced 2026-05-17 17:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug in a%, attempt fix for too much augment problem

Browse Source
This commit is contained in:
Andy K. Massimino
2017-11-06 23:37:16 -05:00
parent 4924e71022
commit 09cb6d0889
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.projections.json
View File

@@ -2,5 +2,6 @@
"plugin/*.vim": {"type": "plugin"},
"autoload/*.vim": {"type": "autoload"},
"doc/*.txt": {"type": "doc"},
"README.md": {"type": "readme"}
"README.md": {"type": "readme"},
"test/*": {"type": "test"}
}

39
autoload/matchup/delim.vim
View File

@@ -200,12 +200,15 @@ function! matchup#delim#get_surrounding(type, ...) " {{{1
\ l:local ? 'open_mid' : 'open')
if empty(l:open) | break | endif
let l:match = matchup#delim#get_matching(l:open, 1)
let l:close = l:local ? l:open.links.next : l:open.links.close
let l:matches = matchup#delim#get_matching(l:open, 1)
let l:pos_val_try = matchup#pos#val(l:close)
\ + strdisplaywidth(l:close.match) - 1
if l:pos_val_try >= l:pos_val_cursor
if len(l:matches)
let l:close = l:local ? l:open.links.next : l:open.links.close
let l:pos_val_try = matchup#pos#val(l:close)
\ + strdisplaywidth(l:close.match) - 1
endif
if len(l:matches) && l:pos_val_try >= l:pos_val_cursor
if l:counter <= 1
" restore cursor and accept
call matchup#pos#set_cursor(l:save_pos)
@@ -765,23 +768,11 @@ function! s:init_delim_lists() " {{{1
" TODO this logic might be bad BADLOGIC
" should we not fill groups that aren't needed?
" l:words[0] should never be used?
" the last element in the order gives the most augmented string
" this includes groups that might not actually be needed elsewhere
if !empty(l:order)
let l:words[0] = l:augments[l:order[-1]]
endif
" dragons: create the augmentation operators from the
" open pattern- this is all super tricky!!
" TODO we should be building the augment later, so
" we can remove augments that can never be filled
" as a concrete example,
" l:augments = { '0': '\<\(wh\%[ile]\|for\)\>', '1': '\<\1\>'}
" l:words[0] = \<\1\>
" now for the rest of the words...
for l:i in range(1, len(l:words)-1)
@@ -938,6 +929,20 @@ function! s:init_delim_lists() " {{{1
endfor
endfor
" TODO should l:words[0] actually be used? BADLOGIC
" the last element in the order gives the most augmented string
" this includes groups that might not actually be needed elsewhere
" as a concrete example,
" l:augments = { '0': '\<\(wh\%[ile]\|for\)\>', '1': '\<\1\>'}
" l:words[0] = \<\1\> (bad)
" instead, get the furthest out needed augment.. Heuristic TODO
for l:g in add(reverse(copy(l:order)), 0)
if has_key(l:all_needed_groups, l:g)
let l:words[0] = l:augments[l:g]
break
endif
endfor
" this is the original set of words plus the set of augments
" TODO this should probably be renamed
call add(l:lists.delim_tex.regex, {