Fix type error when using vim.eval

README.md

@@ -87,7 +87,7 @@ let g:completor_{filetype}_omni_trigger = '<python regex>'
 
 For example to use css omnifunc:
 ```vim
-let g:completor_css_omni_trigger = '(\w+|@\w*|\w+:\s*\w*)$'
+let g:completor_css_omni_trigger = '([\w-]+|@[\w-]*|[\w-]+:\s*[\w-]*)$'
 ```
 
 Install

doc/completor.txt

@@ -105,7 +105,7 @@ Other                                                   *completor-other*
 <
         For example to use css omnifunc:
 >
-            let g:completor_css_omni_trigger = '(\w+|@\w*|\w+:\s*\w*)$'
+            let g:completor_css_omni_trigger = '([\w-]+|@[\w-]*|[\w-]+:\s*[\w-]*)$'
 <
 ==============================================================================
 4. Options                                              *completor-options*

pythonx/completers/_buffer.py

@@ -28,6 +28,15 @@ def test_subseq(src, target):
             return score
 
 
+def getftime(nr):
+    try:
+        bufname = vim.Function('bufname')
+        ftime = vim.Function('getftime')
+        return ftime(bufname(nr))
+    except vim.error:
+        return -1
+
+
 class TokenStore(object):
     pat = re.compile('\w+')
 
@@ -56,7 +65,9 @@ def store_buffer(self, buffer, base, cur_nr, cur_line):
             self.current = set(self.pat.findall(data))
             self.current.difference_update([base])
         elif buffer.valid and len(buffer) <= 10000:
-            ftime = vim.eval('getftime(bufname({}))'.format(nr))
+            ftime = getftime(nr)
+            if ftime < 0:
+                return
             if nr not in self.cache or ftime > self.cache[nr]['t']:
                 self.cache[nr] = {'t': ftime}
                 data = ' '.join(buffer[:])

pythonx/completers/_omni.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from completor import Completor, start_column
+from completor import Completor
 
 import vim
 import re
@@ -37,16 +37,14 @@ def parse(self, base):
             return []
 
         try:
-            start = vim.eval('function(&omnifunc)(1,"")')
-            if start < 0:
+            func_name = vim.eval('&omnifunc')
+            if not func_name:
                 return []
-            codepoint = start_column(ft, base)
-            res = vim.eval('function(&omnifunc)(0,"{}")'.format(
-                base[codepoint:len(base)]))
-            if isinstance(res, dict) and 'words' in res:
-                res = res['words']
-            if not isinstance(res, list):
+
+            omnifunc = vim.Function(func_name)
+            start = omnifunc(1, '')
+            if start < 0:
                 return []
-            return [r for r in res if r]
-        except vim.error:
+            return omnifunc(0, base[start:len(base)])
+        except (vim.error, ValueError, KeyboardInterrupt):
             return []

pythonx/completor/__init__.py

@@ -64,11 +64,11 @@ def commons(cls):
 
     @property
     def current_directory(self):
-        return vim.eval('expand("%:p:h")')
+        return vim.Function('expand')('%:p:h')
 
     @property
     def tempname(self):
-        return vim.eval('completor#utils#tempname()')
+        return vim.Function('completor#utils#tempname')()
 
     @property
     def filename(self):