Copilot.vim 1.4.1

Author: tpope

autoload/copilot.vim

@@ -702,10 +702,6 @@ function! s:commands.feedback(opts) abort
   endif
 endfunction
 
-function! s:commands.log(opts) abort
-  return a:opts.mods . ' split +$ ' . fnameescape(copilot#logger#File())
-endfunction
-
 function! s:commands.restart(opts) abort
   call s:Stop()
   let err = copilot#Agent().StartupError()
@@ -759,10 +755,13 @@ endfunction
 
 function! copilot#Command(line1, line2, range, bang, mods, arg) abort
   let cmd = matchstr(a:arg, '^\%(\\.\|\S\)\+')
+  let arg = matchstr(a:arg, '\s\zs\S.*')
+  if cmd ==# 'log'
+    return a:mods . ' split +$ ' . fnameescape(copilot#logger#File())
+  endif
   if !empty(cmd) && !has_key(s:commands, tr(cmd, '-', '_'))
     return 'echoerr ' . string('Copilot: unknown command ' . string(cmd))
   endif
-  let arg = matchstr(a:arg, '\s\zs\S.*')
   try
     let err = copilot#Agent().StartupError()
     if !empty(err)

autoload/copilot/agent.vim

@@ -5,7 +5,7 @@ let g:autoloaded_copilot_agent = 1
 
 scriptencoding utf-8
 
-let s:plugin_version = '1.4.0'
+let s:plugin_version = '1.4.1'
 
 let s:error_exit = -1
 
@@ -259,7 +259,12 @@ endfunction
 
 function! s:OnExit(agent, code) abort
   let a:agent.exit_status = a:code
-  unlet! a:agent.job
+  if has_key(a:agent, 'job')
+    call remove(a:agent, 'job')
+  endif
+  if has_key(a:agent, 'client_id')
+    call remove(a:agent, 'client_id')
+  endif
   for id in sort(keys(a:agent.requests), { a, b -> +a > +b })
     let request = remove(a:agent.requests, id)
     if request.status ==# 'canceled'
@@ -284,15 +289,14 @@ function! copilot#agent#LspInit(agent_id, initialize_result) abort
     return
   endif
   let instance = s:instances[a:agent_id]
-  call s:GetCapabilitiesResult(a:initialize_result, instance)
+  call timer_start(0, { _ -> s:GetCapabilitiesResult(a:initialize_result, instance)})
 endfunction
 
 function! copilot#agent#LspExit(agent_id, code, signal) abort
   if !has_key(s:instances, a:agent_id)
     return
   endif
   let instance = remove(s:instances, a:agent_id)
-  unlet! instance.client_id
   call s:OnExit(instance, a:code)
 endfunction
 
@@ -305,7 +309,13 @@ endfunction
 
 function! s:LspRequest(method, params, ...) dict abort
   let id = v:lua.require'_copilot'.lsp_request(self.id, a:method, a:params)
-  return call('s:SetUpRequest', [self, id, a:method, a:params] + a:000)
+  if id isnot# v:null
+    return call('s:SetUpRequest', [self, id, a:method, a:params] + a:000)
+  endif
+  if has_key(self, 'client_id')
+    call copilot#agent#LspExit(self.client_id, -1, -1)
+  endif
+  throw 'copilot#agent: LSP client not available'
 endfunction
 
 function! s:LspClose() dict abort

copilot/dist/agent.js

@@ -29,26 +29,31 @@ copilot.lsp_start_client = function(cmd, handler_names)
 end
 
 copilot.lsp_request = function(client_id, method, params, bufnr)
+  local client = vim.lsp.get_client_by_id(client_id)
+  if not client then return end
   bufnr = bufnr or 0
   vim.lsp.buf_attach_client(bufnr, client_id)
-  params.uri = vim.uri_from_bufnr(bufnr)
   local _, id
-  _, id = vim.lsp.get_client_by_id(client_id).request(method, params, function(err, result)
+  _, id = client.request(method, params, function(err, result)
     vim.call('copilot#agent#LspResponse', client_id, {id = id, error = err, result = result}, bufnr)
   end)
   return id
 end
 
 copilot.rpc_request = function(client_id, method, params)
+  local client = vim.lsp.get_client_by_id(client_id)
+  if not client then return end
   local _, id
-  _, id = vim.lsp.get_client_by_id(client_id).rpc.request(method, params, function(err, result)
+  _, id = client.rpc.request(method, params, function(err, result)
     vim.call('copilot#agent#LspResponse', client_id, {id = id, error = err, result = result})
   end)
   return id
 end
 
 copilot.rpc_notify = function(client_id, method, params)
-  return vim.lsp.get_client_by_id(client_id).rpc.notify(method, params)
+  local client = vim.lsp.get_client_by_id(client_id)
+  if not client then return end
+  return client.rpc.notify(method, params)
 end
 
 return copilot