Switch rchunk completion to ncm2

Author: gaalcaras

autoload/ncm_rchunk.vim

@@ -0,0 +1,27 @@
+if get(s:, 'loaded', 0)
+    finish
+endif
+let s:loaded = 1
+
+let g:ncm_rchunk#proc = yarp#py3({
+    \ 'module': 'ncm_rchunk'
+\ })
+
+let g:ncm_rchunk#source = extend(get(g:, 'ncm_rchunk', {}), {
+            \ 'name': 'Rchunk',
+            \ 'priority': 9,
+            \ 'mark': 'Rchunk',
+            \ 'scope': ['rchunk'],
+            \ 'subscope_enable': 1,
+            \ 'word_pattern': '[\w_\.]+',
+            \ 'complete_pattern': [',\s', '=\s"'],
+            \ 'on_complete': 'ncm_rchunk#on_complete',
+            \ }, 'keep')
+
+function! ncm_rchunk#init()
+  call ncm2#register_source(g:ncm_rchunk#source)
+endfunction
+
+function! ncm_rchunk#on_complete(ctx)
+    call g:ncm_rchunk#proc.try_notify('on_complete', a:ctx)
+endfunction

ncm2-plugin/ncm2_R.vim

@@ -1 +1,2 @@
 call ncm_r#init()
+call ncm_rchunk#init()

pythonx/cm_sources/rcode.py

@@ -5,24 +5,12 @@
 by Gabriel Alcaras
 """
 
-from cm import register_source  # pylint: disable=E0401
+import vim # pylint: disable=E0401
 
 from rsource import Rsource  # pylint: disable=E0401
 import filtr  # pylint: disable=E0401
 import rlang  # pylint: disable=E0401
 
-register_source(name='RChunk',
-                priority=9,
-                abbreviation='RChunk',
-                word_pattern=r'[\w_\.]+',
-                scoping=True,
-                scopes=['rchunk'],
-                early_cache=1,
-                cm_refresh_patterns=[
-                    r',\s?',  # New option
-                    r'=\s?"',  # Option value
-                ])
-
 
 class Source(Rsource):  # pylint: disable=too-few-public-methods
     """Completion Manager Source for R Chunk options"""
@@ -121,13 +109,24 @@ def __init__(self, nvim):
         options = sorted(options, key=str.lower)
         self._options = self.matches.from_chunk_options(options)
 
-    def cm_refresh(self, info, ctx,):
+    def on_complete(self, ctx):
         """Refresh NCM list of matches"""
 
         matches = self._options
         option = rlang.get_option(ctx['typed'])
 
+        self._info('hello :: typed: {}, ccol: {},'
+                   ' startccol: {}'.format(ctx['typed'],
+                                           ctx['ccol'],
+                                           ctx['startccol']))
+
         if option:
             matches = filtr.arg(matches, option)
 
-        self.complete(info, ctx, ctx['startcol'], matches)
+        self._info(matches)
+        self.complete(ctx, ctx['scope_len'], matches)
+
+
+SOURCE = Source(vim)
+
+on_complete = SOURCE.on_complete

pythonx/cm_sources/rchunk.py pythonx/ncm_rchunk.pypythonx/cm_sources/rchunk.py renamed to pythonx/ncm_rchunk.py

@@ -270,12 +270,10 @@ def _process_option(self, match):
 
             if quotes:
                 default = quotes.group(1)
-                snip = '"' + default + '"'
 
                 if re.search(r'|', default):
                     values = quotes.group(1).split('|')
-                    default = '"' + values[0] + '"'
-                    snip = ''
+                    default = values[0]
 
                     for value in values:
                         struct = 'value'
@@ -285,7 +283,8 @@ def _process_option(self, match):
                         match['args'].append(self.build(word=value,
                                                         struct=struct))
 
-                add_snippet(match, lhs + ' = "${1:' + snip + '}"')
+                add_snippet(match, lhs + ' = "${1:' + default + '}"')
+                default = '"{}"'.format(default)
             else:
                 default = rhs