Copilot.vim 1.3.1

Author: tpope

README.md

@@ -25,9 +25,10 @@ Service](https://docs.github.com/en/github/site-policy/github-terms-of-service#j
 
 ## Getting started
 
-1.  Install [Node.js][] 12 or newer.
+1.  Install [Neovim][].
 
-2.  Install [Neovim][] 0.6 or newer.
+2.  Install [Node.js][] version 16.  (Other versions should work too, except
+    Node 18 which isn't supported yet.)
 
 3.  Install `github/copilot.vim` using vim-plug, packer.nvim, or any other
     plugin manager.  Or to install directly:

autoload/copilot.vim

@@ -198,7 +198,6 @@ function! copilot#Clear() abort
 endfunction
 
 function! copilot#Dismiss() abort
-  unlet! b:_copilot
   call copilot#Clear()
   return ''
 endfunction
@@ -494,7 +493,6 @@ function! copilot#Schedule(...) abort
 endfunction
 
 function! copilot#OnInsertLeave() abort
-  unlet! b:_copilot
   return copilot#Clear()
 endfunction
 

autoload/copilot/agent.vim

@@ -5,13 +5,15 @@ let g:autoloaded_copilot_agent = 1
 
 scriptencoding utf-8
 
-let s:plugin_version = '1.3.0'
+let s:plugin_version = '1.3.1'
 
 let s:error_exit = -1
 
 let s:root = expand('<sfile>:h:h:h')
 
-let s:instances = {}
+if !exists('s:instances')
+  let s:instances = {}
+endif
 
 let s:jobstop = function(exists('*jobstop') ? 'jobstop' : 'job_stop')
 function! s:Kill(agent, ...) abort
@@ -119,6 +121,7 @@ endfunction
 function! s:AgentCancel(request) dict abort
   if has_key(self.requests, get(a:request, 'id', ''))
     call remove(self.requests, a:request.id)
+    call self.Notify('$/cancelRequest', {'id': a:request.id})
   endif
   if get(a:request, 'status', '') ==# 'running'
     let a:request.status = 'canceled'
@@ -132,6 +135,7 @@ function! s:RequestCancel() dict abort
   elseif get(self, 'status', '') ==# 'running'
     let self.status = 'canceled'
   endif
+  return self
 endfunction
 
 function! s:DispatchMessage(agent, handler, id, params, ...) abort
@@ -272,32 +276,38 @@ function! s:IsArmMacOS() abort
 endfunction
 
 function! s:Command() abort
-  if !has('nvim-0.5') && v:version < 802
+  if !has('nvim-0.6') && v:version < 802
     return [v:null, 'Vim version too old']
   endif
-  let node = get(g:, 'copilot_node_command', 'node')
-  if type(node) == type('')
-    let node = [node]
+  let node = get(g:, 'copilot_node_command', '')
+  if empty(node)
+    let node = ['node']
+  elseif type(node) == type('')
+    let node = [expand(node)]
   endif
   if !executable(get(node, 0, ''))
     if get(node, 0, '') ==# 'node'
-      return [v:null, 'Node not found in PATH']
+      return [v:null, 'Node.js not found in PATH']
     else
-      return [v:null, 'Node executable `' . get(node, 0, '') . "' not found"]
+      return [v:null, 'Node.js executable `' . get(node, 0, '') . "' not found"]
     endif
   endif
   let out = []
   let err = []
   let status = copilot#job#Stream(node + ['--version'], function('add', [out]), function('add', [err]))
   if status != 0
-    return [v:null, 'Node exited with status ' . status]
+    return [v:null, 'Node.js exited with status ' . status]
   endif
-  let major = +matchstr(join(out, ''), '^v\zs\d\+\ze\.')
+  let node_version = matchstr(join(out, ''), '^v\zs\d\+\.[^[:space:]]*')
+  let major = str2nr(node_version)
+  let too_new = major >= 18 && node_version !=# '18.0.0'
   if !get(g:, 'copilot_ignore_node_version')
-    if major < 16 && s:IsArmMacOS()
-      return [v:null, 'Node v16+ required on Apple Silicon but found ' . get(out, 0, 'nothing')]
-    elseif major < 12
-      return [v:null, 'Node v12+ required but found ' . get(out, 0, 'nothing')]
+    if major == 0
+      return [v:null, 'Could not determine Node.js version']
+    elseif (major < 16 || too_new) && s:IsArmMacOS()
+      return [v:null, 'Node.js version 16.x or 17.x required on Apple Silicon but found ' . node_version]
+    elseif major < 12 || too_new
+      return [v:null, 'Node.js version 12.x–17.x required but found ' . node_version]
     endif
   endif
   let agent = s:root . '/copilot/dist/agent.js'

autoload/copilot/job.vim

@@ -79,6 +79,7 @@ function! copilot#job#Stream(argv, out_cb, err_cb, ...) abort
   if exists('*job_start')
     let result = {}
     let job = job_start(a:argv, {
+          \ 'cwd': expand("~"),
           \ 'out_mode': 'raw',
           \ 'out_cb': { j, d -> OutCb(d) },
           \ 'err_cb': { j, d -> ErrCb(d) },
@@ -87,6 +88,7 @@ function! copilot#job#Stream(argv, out_cb, err_cb, ...) abort
           \ })
   else
     let jopts = {
+          \ 'cwd': expand("~"),
           \ 'stderr': [''],
           \ 'on_stdout': { j, d, t -> OutCb(join(d, "\n")) },
           \ 'on_stderr': function('s:NvimCallback', [ErrCb]),

copilot/dist/agent.js

@@ -102,5 +102,17 @@ after/colors/<colorschemename>.vim in your 'runtimepath' (e.g.,
 ~/.config/nvim/after/colors/solarized.vim).  Example declaration:
 >
         highlight CopilotSuggestion guifg=#555555 ctermfg=8
+<
+CONFIGURATION                                   *copilot-configuration*
+
+                                                *g:copilot_node_command*
+Tell Copilot what `node` binary to use with g:copilot_node_command.
+This is useful if the `node` in your PATH is an unsupported version.
+>
+        let g:copilot_node_command = "~/.nodenv/versions/16.15.0/bin/node"
+<
+Lua version:
+>
+        vim.g.copilot_node_command = "$NVM_DIR/versions/node/v16.15.0/bin/node"
 <
  vim:tw=78:et:ft=help:norl: