refine matching for chinese characters. this has not been completely …

…fixed yet

pythonx/cm_core.py

@@ -330,7 +330,6 @@ def _refresh_completions(self,ctx):
 
         col = ctx['col']
         startcol = col
-        base = ctx['typed'][startcol-1:]
 
         # basick processing per source
         for name in names:
@@ -391,7 +390,6 @@ def _refresh_completions(self,ctx):
 
     def process_matches(self,name,ctx,startcol,matches):
 
-        base = ctx['typed'][startcol-1:]
         abbr = self._sources[name].get('abbreviation','')
 
         # formalize datastructure
@@ -405,7 +403,6 @@ def process_matches(self,name,ctx,startcol,matches):
             formalized.append(e)
 
         # filtering and sorting
-        # result = [ e for e in formalized if self._matcher(base=base,item=e)]
         result = cm.get_matcher(self._nvim).process(name,ctx,startcol,formalized)
 
         # fix some text

pythonx/cm_matchers/fuzzy_matcher.py

@@ -8,7 +8,16 @@ def __init__(self,nvim,chcmp,*args):
 
     def process(self,name,ctx,startcol,matches):
 
-        base = ctx['typed'][startcol-1:]
+        # fix for chinese characters
+        # `你好 abcd|` 
+        # has  col('.')==11 on vim
+        # the evaluated startcol is: startcol[8] typed[你好 abcd]
+        # but in python, "你好 abcd"[8] is not a valid index
+        begin = -(ctx['col'] - startcol)
+        base = ''
+        if begin:
+            base = ctx['typed'][begin:]
+
 
         tmp = []
         for item in matches:

pythonx/cm_matchers/prefix_matcher.py

@@ -8,15 +8,23 @@ def __init__(self,nvim,chcmp,*args):
 
     def process(self,name,ctx,startcol,matches):
 
-        base = ctx['typed'][startcol-1:]
-
-        matches = [m for m in matches if self._match(base,m)]
+        # fix for chinese characters
+        # `你好 abcd|` 
+        # has  col('.')==11 on vim
+        # the evaluated startcol is: startcol[8] typed[你好 abcd]
+        # but in python, "你好 abcd"[8] is not a valid index
+        begin = -(ctx['col'] - startcol)
+        base = ''
+        if begin:
+            base = ctx['typed'][begin:]
+
+        ret = [m for m in matches if self._match(base,m)]
 
         # in python, 'A' sort's before 'a', we need to swapcase for the 'a'
         # sorting before 'A'
-        matches.sort(key=lambda e: e['word'].swapcase())
+        ret.sort(key=lambda e: e['word'].swapcase())
 
-        return matches
+        return ret
 
     def _match(self,base,item):
         if len(base)>len(item['word']):