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

Fix error when filetype is a number

Browse Source 
The VimExpressionToPythonType function automatically convert a number
represented as a string to an integer. This causes an error when used to
evaluate a filetype set to a number as the result is split on the dot character
to get a list of filetypes and an integer cannot be split. Use vim.eval and
ToUnicode instead.
This commit is contained in:
micbou 2017-11-26 16:30:59 +01:00
parent 31abb9cee5
commit 67d2a0fbf8
No known key found for this signature in database
GPG Key ID: C7E8FD1F3BDA1E05
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
python/ycm/tests/vimsupport_test.py
View File

@ -32,7 +32,7 @@ MockVimModule()
from ycm import vimsupport from ycm import vimsupport
from nose.tools import eq_ from nose.tools import eq_
from hamcrest import assert_that, calling, equal_to, has_entry, raises from hamcrest import assert_that, calling, contains, equal_to, has_entry, raises
from mock import MagicMock, call, patch from mock import MagicMock, call, patch
from ycmd.utils import ToBytes from ycmd.utils import ToBytes
import os import os
@ -1553,6 +1553,15 @@ def SelectFromList_Negative_test( vim_eval ):
raises( RuntimeError, vimsupport.NO_SELECTION_MADE_MSG ) ) raises( RuntimeError, vimsupport.NO_SELECTION_MADE_MSG ) )
def Filetypes_IntegerFiletype_test():
current_buffer = VimBuffer( 'buffer', number = 1, filetype = '42' )
with MockVimBuffers( [ current_buffer ], current_buffer ):
assert_that( vimsupport.CurrentFiletypes(), contains( '42' ) )
assert_that( vimsupport.GetBufferFiletypes( 1 ), contains( '42' ) )
assert_that( vimsupport.FiletypesForBuffer( current_buffer ),
contains( '42' ) )
@patch( 'ycm.vimsupport.VariableExists', return_value = False ) @patch( 'ycm.vimsupport.VariableExists', return_value = False )
@patch( 'ycm.vimsupport.SearchInCurrentBuffer', return_value = 0 ) @patch( 'ycm.vimsupport.SearchInCurrentBuffer', return_value = 0 )
@patch( 'vim.current' ) @patch( 'vim.current' )

6
python/ycm/vimsupport.py
View File

@ -589,18 +589,18 @@ def EscapeForVim( text ):
def CurrentFiletypes(): def CurrentFiletypes():
return VimExpressionToPythonType( "&filetype" ).split( '.' ) return ToUnicode( vim.eval( "&filetype" ) ).split( '.' )
def GetBufferFiletypes( bufnr ): def GetBufferFiletypes( bufnr ):
command = 'getbufvar({0}, "&ft")'.format( bufnr ) command = 'getbufvar({0}, "&ft")'.format( bufnr )
return VimExpressionToPythonType( command ).split( '.' ) return ToUnicode( vim.eval( command ) ).split( '.' )
def FiletypesForBuffer( buffer_object ): def FiletypesForBuffer( buffer_object ):
# NOTE: Getting &ft for other buffers only works when the buffer has been # NOTE: Getting &ft for other buffers only works when the buffer has been
# visited by the user at least once, which is true for modified buffers # visited by the user at least once, which is true for modified buffers
return GetBufferOption( buffer_object, 'ft' ).split( '.' ) return ToUnicode( GetBufferOption( buffer_object, 'ft' ) ).split( '.' )
def VariableExists( variable ): def VariableExists( variable ):