vim/UltiSnips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix b->b2<BS> case, fix merge

Browse Source
This commit is contained in:
Stanislav Seletskiy 2015-07-20 18:03:09 +06:00
parent 14ea90385b
commit 6c4fb6f3f2
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/UltiSnips.vim
View File

@ -46,6 +46,12 @@ command! -bang -nargs=? -complete=customlist,UltiSnips#FileTypeComplete UltiSnip
command! -nargs=1 UltiSnipsAddFiletypes :call UltiSnips#AddFiletypes(<q-args>) command! -nargs=1 UltiSnipsAddFiletypes :call UltiSnips#AddFiletypes(<q-args>)
augroup UltiSnips_AutoTrigger
au!
au InsertCharPre * call UltiSnips#TrackChange()
au TextChangedI * call UltiSnips#TrackChange()
augroup END
call UltiSnips#map_keys#MapKeys() call UltiSnips#map_keys#MapKeys()
" vim: ts=8 sts=4 sw=4 " vim: ts=8 sts=4 sw=4

5
pythonx/UltiSnips/snippet_manager.py
View File

@ -365,8 +365,6 @@ class SnippetManager(object):
_vim.command('autocmd!') _vim.command('autocmd!')
_vim.command('autocmd CursorMovedI * call UltiSnips#CursorMoved()') _vim.command('autocmd CursorMovedI * call UltiSnips#CursorMoved()')
_vim.command('autocmd CursorMoved * call UltiSnips#CursorMoved()') _vim.command('autocmd CursorMoved * call UltiSnips#CursorMoved()')
_vim.command('autocmd InsertCharPre * call UltiSnips#TrackChange()')
_vim.command('autocmd TextChangedI * call UltiSnips#TrackChange()')
_vim.command( _vim.command(
'autocmd InsertLeave * call UltiSnips#LeavingInsertMode()') 'autocmd InsertLeave * call UltiSnips#LeavingInsertMode()')
@ -779,11 +777,12 @@ class SnippetManager(object):
@err_to_scratch_buffer @err_to_scratch_buffer
def _track_change(self): def _track_change(self):
inserted_char = _vim.eval('v:char') inserted_char = _vim.eval('v:char')
try:
if inserted_char == '': if inserted_char == '':
before = _vim.buf.line_till_cursor before = _vim.buf.line_till_cursor
if before and before[-1] == self._last_inserted_char: if before and before[-1] == self._last_inserted_char:
self._try_expand(autotrigger_only=True) self._try_expand(autotrigger_only=True)
else: finally:
self._last_inserted_char = inserted_char self._last_inserted_char = inserted_char