Fix traceback when a syntax file has unicode characters

vim.eval returns a str() object on py2, but our internal strings are all unicode(). We use vimsupport.VimExpressionToPythonType to wrap the conversion complexities.
avalenzu · Mar 10, 2016 · 953885c · 953885c
1 parent 385dae5
commit 953885c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/python/ycm/syntax_parse.py b/python/ycm/syntax_parse.py
@@ -89,7 +89,7 @@ def SyntaxKeywordsForCurrentBuffer():
   vim.command( 'redir => b:ycm_syntax' )
   vim.command( 'silent! syntax list' )
   vim.command( 'redir END' )
-  syntax_output = vimsupport.GetVariableValue( 'b:ycm_syntax' )
+  syntax_output = vimsupport.VimExpressionToPythonType( 'b:ycm_syntax' )
   return _KeywordsFromSyntaxListOutput( syntax_output )
 
 

diff --git a/python/ycm/vimsupport.py b/python/ycm/vimsupport.py
@@ -500,7 +500,7 @@ def EscapeForVim( text ):
 
 
 def CurrentFiletypes():
-  return vim.eval( "&filetype" ).split( '.' )
+  return VimExpressionToPythonType( "&filetype" ).split( '.' )
 
 
 def FiletypesForBuffer( buffer_object ):