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

Decoding completion strings to utf8 for Vim

Browse Source 
Fixes #761
Fixes #775
This commit is contained in:
Strahinja Val Markovic 2014-01-15 11:24:30 -08:00
parent e9816c3823
commit 433b3b64f0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
python/ycm/client/completion_request.py
View File

@ -19,6 +19,7 @@
from ycm import base from ycm import base
from ycm import vimsupport from ycm import vimsupport
from ycm.utils import ToUtf8IfNeeded
from ycm.client.base_request import ( BaseRequest, BuildRequestData, from ycm.client.base_request import ( BaseRequest, BuildRequestData,
JsonFromFuture ) JsonFromFuture )
@ -65,17 +66,17 @@ class CompletionRequest( BaseRequest ):
def _ConvertCompletionDataToVimData( completion_data ): def _ConvertCompletionDataToVimData( completion_data ):
# see :h complete-items for a description of the dictionary fields # see :h complete-items for a description of the dictionary fields
vim_data = { vim_data = {
'word' : completion_data[ 'insertion_text' ], 'word' : ToUtf8IfNeeded( completion_data[ 'insertion_text' ] ),
'dup' : 1, 'dup' : 1,
} }
if 'menu_text' in completion_data: if 'menu_text' in completion_data:
vim_data[ 'abbr' ] = completion_data[ 'menu_text' ] vim_data[ 'abbr' ] = ToUtf8IfNeeded( completion_data[ 'menu_text' ] )
if 'extra_menu_info' in completion_data: if 'extra_menu_info' in completion_data:
vim_data[ 'menu' ] = completion_data[ 'extra_menu_info' ] vim_data[ 'menu' ] = ToUtf8IfNeeded( completion_data[ 'extra_menu_info' ] )
if 'kind' in completion_data: if 'kind' in completion_data:
vim_data[ 'kind' ] = completion_data[ 'kind' ] vim_data[ 'kind' ] = ToUtf8IfNeeded( completion_data[ 'kind' ] )
if 'detailed_info' in completion_data: if 'detailed_info' in completion_data:
vim_data[ 'info' ] = completion_data[ 'detailed_info' ] vim_data[ 'info' ] = ToUtf8IfNeeded( completion_data[ 'detailed_info' ] )
return vim_data return vim_data