Copilot.vim 1.4.0

Author: tpope

autoload/copilot.vim

@@ -50,7 +50,7 @@ function! copilot#Init(...) abort
 endfunction
 
 function! s:Start() abort
-  if exists('s:agent.job')
+  if exists('s:agent.job') || exists('s:agent.client_id')
     return
   endif
   let s:agent = copilot#agent#New({'notifications': {

autoload/copilot/agent.vim

@@ -5,7 +5,7 @@ let g:autoloaded_copilot_agent = 1
 
 scriptencoding utf-8
 
-let s:plugin_version = '1.3.5'
+let s:plugin_version = '1.4.0'
 
 let s:error_exit = -1
 
@@ -15,6 +15,11 @@ if !exists('s:instances')
   let s:instances = {}
 endif
 
+" allow sourcing this file to reload the Lua file too
+if has('nvim')
+  lua package.loaded._copilot = nil
+endif
+
 let s:jobstop = function(exists('*jobstop') ? 'jobstop' : 'job_stop')
 function! s:Kill(agent, ...) abort
   if has_key(a:agent, 'job')
@@ -49,7 +54,8 @@ function! s:Send(agent, request) abort
 endfunction
 
 function! s:AgentNotify(method, params) dict abort
-  return s:Send(self, {'method': a:method, 'params': a:params})
+  call s:Send(self, {'method': a:method, 'params': a:params})
+  return v:true
 endfunction
 
 function! s:RequestWait() dict abort
@@ -77,20 +83,21 @@ endfunction
 if !exists('s:id')
   let s:id = 0
 endif
-function! s:AgentRequest(method, params, ...) dict abort
-  let s:id += 1
-  let request = {'method': a:method, 'params': a:params, 'id': s:id}
-  call s:Send(self, request)
-  call extend(request, {
-        \ 'agent_id': self.id,
+
+function s:SetUpRequest(agent, id, method, params, ...) abort
+  let request = {
+        \ 'agent_id': a:agent.id,
+        \ 'id': a:id,
+        \ 'method': a:method,
+        \ 'params': a:params,
         \ 'Agent': function('s:RequestAgent'),
         \ 'Wait': function('s:RequestWait'),
         \ 'Await': function('s:RequestAwait'),
         \ 'Cancel': function('s:RequestCancel'),
         \ 'resolve': [],
         \ 'reject': [],
-        \ 'status': 'running'})
-  let self.requests[s:id] = request
+        \ 'status': 'running'}
+  let a:agent.requests[a:id] = request
   let args = a:000[2:-1]
   if len(args)
     if !empty(a:1)
@@ -110,6 +117,13 @@ function! s:AgentRequest(method, params, ...) dict abort
   return request
 endfunction
 
+function! s:AgentRequest(method, params, ...) dict abort
+  let s:id += 1
+  let request = {'method': a:method, 'params': a:params, 'id': s:id}
+  call s:Send(self, request)
+  return call('s:SetUpRequest', [self, s:id, a:method, a:params] + a:000)
+endfunction
+
 function! s:AgentCall(method, params, ...) dict abort
   let request = call(self.Request, [a:method, a:params] + a:000)
   if a:0
@@ -160,7 +174,11 @@ function! s:OnMessage(agent, body, ...) abort
   if type(response) != v:t_dict
     return
   endif
+  return s:OnResponse(a:agent, response)
+endfunction
 
+function! s:OnResponse(agent, response, ...) abort
+  let response = a:response
   let id = get(response, 'id', v:null)
   if has_key(response, 'method')
     let params = get(response, 'params', v:null)
@@ -241,7 +259,7 @@ endfunction
 
 function! s:OnExit(agent, code) abort
   let a:agent.exit_status = a:code
-  call remove(a:agent, 'job')
+  unlet! a:agent.job
   for id in sort(keys(a:agent.requests), { a, b -> +a > +b })
     let request = remove(a:agent.requests, id)
     if request.status ==# 'canceled'
@@ -261,6 +279,53 @@ function! s:OnExit(agent, code) abort
   call copilot#logger#Info('agent exited with status ' . a:code)
 endfunction
 
+function! copilot#agent#LspInit(agent_id, initialize_result) abort
+  if !has_key(s:instances, a:agent_id)
+    return
+  endif
+  let instance = s:instances[a:agent_id]
+  call 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
+
+function! copilot#agent#LspResponse(agent_id, opts, ...) abort
+  if !has_key(s:instances, a:agent_id)
+    return
+  endif
+  call s:OnResponse(s:instances[a:agent_id], a:opts)
+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)
+endfunction
+
+function! s:LspClose() dict abort
+  if !has_key(self, 'client_id')
+    return
+  endif
+  return luaeval('vim.lsp.get_client_by_id(_A).stop()', self.client_id)
+endfunction
+
+function! s:LspNotify(method, params) dict abort
+  return v:lua.require'_copilot'.rpc_notify(self.id, a:method, a:params)
+endfunction
+
+function copilot#agent#LspHandle(agent_id, response) abort
+  if !has_key(s:instances, a:agent_id)
+    return
+  endif
+  call s:OnResponse(s:instances[a:agent_id], a:response)
+endfunction
+
 unlet! s:is_arm_macos
 function! s:IsArmMacOS() abort
   if exists('s:is_arm_macos')
@@ -351,7 +416,7 @@ function! s:AgentStartupError() dict abort
   while has_key(self, 'job') && !has_key(self, 'startup_error') && !has_key(self, 'capabilities')
     sleep 10m
   endwhile
-  if has_key(self, 'capabilities')
+  if has_key(self, 'capabilities') || has_key(self, 'client_id')
     return ''
   else
     return get(self, 'startup_error', 'Something unexpected went wrong spawning the agent')
@@ -376,13 +441,22 @@ function! copilot#agent#New(...) abort
     let instance.startup_error = command_error
     return instance
   endif
-  let state = {'headers': {}, 'mode': 'headers', 'buffer': ''}
-  let instance.job = copilot#job#Stream(command,
-        \ function('s:OnOut', [instance, state]),
-        \ function('s:OnErr', [instance]),
-        \ function('s:OnExit', [instance]))
-  let instance.id = exists('*jobpid') ? jobpid(instance.job) : job_info(instance.job).process
-  let request = instance.Request('initialize', {'capabilities': {}}, function('s:GetCapabilitiesResult'), function('s:GetCapabilitiesError'), instance)
+  if has('nvim')
+    call extend(instance, {
+        \ 'Close': function('s:LspClose'),
+        \ 'Notify': function('s:LspNotify'),
+        \ 'Request': function('s:LspRequest')})
+    let instance.client_id = v:lua.require'_copilot'.lsp_start_client(command, keys(instance.notifications) + keys(instance.methods) + ['LogMessage'])
+    let instance.id = instance.client_id
+  else
+    let state = {'headers': {}, 'mode': 'headers', 'buffer': ''}
+    let instance.job = copilot#job#Stream(command,
+          \ function('s:OnOut', [instance, state]),
+          \ function('s:OnErr', [instance]),
+          \ function('s:OnExit', [instance]))
+    let instance.id = exists('*jobpid') ? jobpid(instance.job) : job_info(instance.job).process
+    let request = instance.Request('initialize', {'capabilities': {'workspace': {'workspaceFolders': v:true}}}, function('s:GetCapabilitiesResult'), function('s:GetCapabilitiesError'), instance)
+  endif
   let s:instances[instance.id] = instance
   return instance
 endfunction

autoload/copilot/doc.vim

@@ -82,5 +82,12 @@ endfunction
 
 function! copilot#doc#Params(...) abort
   let extra = a:0 ? a:1 : {}
-  return extend({'doc': extend(copilot#doc#Get(), get(extra, 'doc', {}))}, extra, 'keep')
+  let params = extend({'doc': extend(copilot#doc#Get(), get(extra, 'doc', {}))}, extra, 'keep')
+  let params.textDocument = {
+        \ 'uri': params.doc.uri,
+        \ 'languageId': params.doc.languageId,
+        \ 'relativePath': params.doc.relativePath,
+        \ }
+  let params.position = params.doc.position
+  return params
 endfunction

autoload/copilot/panel.vim

@@ -133,6 +133,7 @@ function! copilot#panel#Open(opts) abort
     stopinsert
   else
     let params.doc.position.character = copilot#doc#UTF16Width(state.line)
+    let params.position.character = params.doc.position.character
   endif
   let response = copilot#Request('getPanelCompletions', params).Wait()
   if response.status ==# 'error'

copilot/dist/agent.js

@@ -0,0 +1,54 @@
+local copilot = {}
+
+copilot.lsp_start_client = function(cmd, handler_names)
+  local handlers = {}
+  local id
+  for _, name in ipairs(handler_names) do
+    handlers[name] = function(err, result)
+      if result then
+        local retval = vim.call('copilot#agent#LspHandle', id, {method = name, params = result})
+        if retval ~= 0 then return retval end
+      end
+    end
+  end
+  id = vim.lsp.start_client({
+    cmd = cmd,
+    name = 'copilot',
+    handlers = handlers,
+    get_language_id = function(bufnr, filetype)
+      return vim.call('copilot#doc#LanguageForFileType', filetype)
+    end,
+    on_init = function(client, initialize_result)
+      vim.call('copilot#agent#LspInit', client.id, initialize_result)
+    end,
+    on_exit = function(code, signal, client_id)
+      vim.call('copilot#agent#LspExit', client_id, code, signal)
+    end
+  })
+  return id
+end
+
+copilot.lsp_request = function(client_id, method, params, bufnr)
+  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)
+    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 _, id
+  _, id = vim.lsp.get_client_by_id(client_id).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)
+end
+
+return copilot