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

Restore cursor position after omnifunc calls

Browse Source 
An omnifunc may move the cursor position even on the first call.
This commit is contained in:
micbou 2018-08-13 17:34:04 +02:00
parent a688da3b96
commit 24ab8ca941
No known key found for this signature in database
GPG Key ID: C7E8FD1F3BDA1E05
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
python/ycm/omni_completer.py
View File

@ -78,6 +78,14 @@ class OmniCompleter( Completer ):
if not self._omnifunc: if not self._omnifunc:
return [] return []
# Calling directly the omnifunc may move the cursor position. This is the
# case with the default Vim omnifunc for C-family languages
# (ccomplete#Complete) which calls searchdecl to find a declaration. This
# function is supposed to move the cursor to the found declaration but it
# doesn't when called through the omni completion mapping (CTRL-X CTRL-O).
# So, we restore the cursor position after the omnifunc calls.
line, column = vimsupport.CurrentLineAndColumn()
try: try:
start_column = vimsupport.GetIntValue( self._omnifunc + '(1,"")' ) start_column = vimsupport.GetIntValue( self._omnifunc + '(1,"")' )
if start_column < 0: if start_column < 0:
@ -92,14 +100,6 @@ class OmniCompleter( Completer ):
# because it affects the value returned by 'query'. # because it affects the value returned by 'query'.
request_data[ 'start_column' ] = start_column + 1 request_data[ 'start_column' ] = start_column + 1
# Calling directly the omnifunc may move the cursor position. This is the
# case with the default Vim omnifunc for C-family languages
# (ccomplete#Complete) which calls searchdecl to find a declaration. This
# function is supposed to move the cursor to the found declaration but it
# doesn't when called through the omni completion mapping (CTRL-X CTRL-O).
# So, we restore the cursor position after calling the omnifunc.
line, column = vimsupport.CurrentLineAndColumn()
# Vim internally moves the cursor to the start column before calling again # Vim internally moves the cursor to the start column before calling again
# the omnifunc. Some omnifuncs like the one defined by the # the omnifunc. Some omnifuncs like the one defined by the
# LanguageClient-neovim plugin depend on this behavior to compute the list # LanguageClient-neovim plugin depend on this behavior to compute the list
@ -112,8 +112,6 @@ class OmniCompleter( Completer ):
"')" ] "')" ]
items = vim.eval( ''.join( omnifunc_call ) ) items = vim.eval( ''.join( omnifunc_call ) )
vimsupport.SetCurrentLineAndColumn( line, column )
if isinstance( items, dict ) and 'words' in items: if isinstance( items, dict ) and 'words' in items:
items = items[ 'words' ] items = items[ 'words' ]
@ -127,6 +125,9 @@ class OmniCompleter( Completer ):
OMNIFUNC_RETURNED_BAD_VALUE + ' ' + str( error ) ) OMNIFUNC_RETURNED_BAD_VALUE + ' ' + str( error ) )
return [] return []
finally:
vimsupport.SetCurrentLineAndColumn( line, column )
def FilterAndSortCandidatesInner( self, candidates, sort_property, query ): def FilterAndSortCandidatesInner( self, candidates, sort_property, query ):
request_data = { request_data = {

2
python/ycm/tests/omni_completer_test.py
View File

@ -622,9 +622,9 @@ def OmniCompleter_GetCompletions_RestoreCursorPositionAfterOmnifuncCall_test(
# This omnifunc moves the cursor to the test definition like # This omnifunc moves the cursor to the test definition like
# ccomplete#Complete would. # ccomplete#Complete would.
def Omnifunc( findstart, base ): def Omnifunc( findstart, base ):
vimsupport.SetCurrentLineAndColumn( 0, 0 )
if findstart: if findstart:
return 5 return 5
vimsupport.SetCurrentLineAndColumn( 0, 0 )
return [ 'length' ] return [ 'length' ]
current_buffer = VimBuffer( 'buffer', current_buffer = VimBuffer( 'buffer',