Copilot.vim 1.13.0

Author: tpope

autoload/copilot.vim

@@ -60,10 +60,11 @@ function! s:Start() abort
   if s:Running()
     return
   endif
-  let s:agent = copilot#agent#New({'notifications': {
+  let s:agent = copilot#agent#New({'methods': {
         \ 'statusNotification': function('s:StatusNotification'),
         \ 'PanelSolution': function('copilot#panel#Solution'),
         \ 'PanelSolutionsDone': function('copilot#panel#SolutionsDone'),
+        \ 'copilot/openURL': function('s:OpenURL'),
         \ },
         \ 'editorConfiguration' : s:EditorConfiguration()})
 endfunction
@@ -412,10 +413,11 @@ function! copilot#IsMapped() abort
 endfunction
 
 function! copilot#Schedule(...) abort
-  call copilot#Clear()
   if !s:has_ghost_text || !copilot#Enabled() || !copilot#IsMapped()
+    call copilot#Clear()
     return
   endif
+  call s:UpdatePreview()
   let delay = a:0 ? a:1 : get(g:, 'copilot_idle_delay', 15)
   let g:_copilot_timer = timer_start(delay, function('s:Trigger', [bufnr('')]))
 endfunction
@@ -502,18 +504,40 @@ endfunction
 
 function! copilot#Browser() abort
   if type(get(g:, 'copilot_browser')) == v:t_list
-    return copy(g:copilot_browser)
-  elseif type(get(g:, 'browser_command')) == v:t_list
-    return copy(g:browser_command)
-  elseif has('win32') && executable('rundll32')
-    return ['rundll32', 'url.dll,FileProtocolHandler']
-  elseif isdirectory('/private') && executable('/usr/bin/open')
-    return ['/usr/bin/open']
+    let cmd = copy(g:copilot_browser)
+  elseif type(get(g:, 'open_command')) == v:t_list
+    let cmd = copy(g:open_command)
+  elseif has('win32')
+    let cmd = ['rundll32', 'url.dll,FileProtocolHandler']
+  elseif has('mac')
+    let cmd = ['open']
+  elseif executable('wslview')
+    return ['wslview']
   elseif executable('xdg-open')
     return ['xdg-open']
   else
     return []
   endif
+  if executable(get(cmd, 0, ''))
+    return cmd
+  else
+    return []
+  endif
+endfunction
+
+function! s:OpenURL(params) abort
+  echo a:params.target
+  let browser = copilot#Browser()
+  if empty(browser)
+    return v:false
+  endif
+  let status = {}
+  call copilot#job#Stream(browser + [a:params.target], v:null, v:null, function('s:BrowserCallback', [status]))
+  let time = reltime()
+  while empty(status) && reltimefloat(reltime(time)) < 1
+    sleep 10m
+  endwhile
+  return get(status, 'code') ? v:false : v:true
 endfunction
 
 let s:commands = {}

autoload/copilot/agent.vim

@@ -5,7 +5,7 @@ let g:autoloaded_copilot_agent = 1
 
 scriptencoding utf-8
 
-let s:plugin_version = '1.12.1'
+let s:plugin_version = '1.13.0'
 
 let s:error_exit = -1
 
@@ -44,14 +44,31 @@ function! s:LogSend(request, line) abort
   return '--> ' . a:line
 endfunction
 
+function! s:RejectRequest(request, error) abort
+  if a:request.status ==# 'canceled'
+    return
+  endif
+  let a:request.waiting = {}
+  call remove(a:request, 'resolve')
+  let reject = remove(a:request, 'reject')
+  let a:request.status = 'error'
+  let a:request.error = a:error
+  for Cb in reject
+    let a:request.waiting[timer_start(0, function('s:Callback', [a:request, 'error', Cb]))] = 1
+  endfor
+endfunction
+
 function! s:Send(agent, request) abort
-  call ch_sendexpr(a:agent.job, a:request)
-  return a:request
+  try
+    call ch_sendexpr(a:agent.job, a:request)
+    return v:true
+  catch /^Vim\%((\a\+)\)\=:E631:/
+    return v:false
+  endtry
 endfunction
 
 function! s:AgentNotify(method, params) dict abort
-  call s:Send(self, {'method': a:method, 'params': a:params})
-  return v:true
+  return s:Send(self, {'method': a:method, 'params': a:params})
 endfunction
 
 function! s:RequestWait() dict abort
@@ -138,12 +155,22 @@ function! s:BufferText(bufnr) abort
   return join(getbufline(a:bufnr, 1, '$'), "\n") . "\n"
 endfunction
 
+function! s:LogMessage(params) abort
+  call copilot#logger#Raw(get(a:params, 'level', 3), get(a:params, 'message', ''))
+endfunction
+
 function! s:ShowMessageRequest(params) abort
   let choice = inputlist([a:params.message . "\n\nRequest Actions:"] +
         \ map(copy(get(a:params, 'actions', [])), { i, v -> (i + 1) . '. ' . v.title}))
   return choice > 0 ? get(a:params.actions, choice - 1, v:null) : v:null
 endfunction
 
+function! s:SendRequest(agent, request) abort
+  if empty(s:Send(a:agent, a:request)) && has_key(a:agent.requests, a:request.id)
+    call s:RejectRequest(remove(a:agent.requests, a:request.id), {'code': 257, 'message': 'Write failed'})
+  endif
+endfunction
+
 function! s:AgentRequest(method, params, ...) dict abort
   let s:id += 1
   let request = {'method': a:method, 'params': deepcopy(a:params), 'id': s:id}
@@ -173,15 +200,15 @@ function! s:AgentRequest(method, params, ...) dict abort
     else
       let vtd_id = {
             \ 'uri': doc.uri,
-            \ 'version': getbufvar(bufnr, 'changedtick')}
+            \ 'version': doc_version}
       call self.Notify('textDocument/didChange', {
             \ 'textDocument': vtd_id,
             \ 'contentChanges': [{'text': s:BufferText(bufnr)}]})
-      let self.open_buffers[bufnr].version = version
+      let self.open_buffers[bufnr].version = doc_version
     endif
     let doc.version = doc_version
   endfor
-  call timer_start(0, { _ -> s:Send(self, request) })
+  call timer_start(0, { _ -> s:SendRequest(self, request) })
   return call('s:SetUpRequest', [self, s:id, a:method, a:params] + a:000)
 endfunction
 
@@ -216,13 +243,17 @@ endfunction
 function! s:DispatchMessage(agent, handler, id, params, ...) abort
   try
     let response = {'result': call(a:handler, [a:params])}
+    if response.result is# 0
+      let response.result = v:null
+    endif
   catch
     call copilot#logger#Exception()
     let response = {'error': {'code': -32000, 'message': v:exception}}
   endtry
   if !empty(a:id)
     call s:Send(a:agent, extend({'id': a:id}, response))
   endif
+  return response
 endfunction
 
 function! s:OnMessage(agent, body, ...) abort
@@ -232,16 +263,10 @@ function! s:OnMessage(agent, body, ...) abort
   let request = a:body
   let id = get(request, 'id', v:null)
   let params = get(request, 'params', v:null)
-  if empty(id)
-    if has_key(a:agent.notifications, request.method)
-      call timer_start(0, { _ -> a:agent.notifications[request.method](params) })
-    elseif request.method ==# 'LogMessage'
-      call copilot#logger#Raw(get(params, 'level', 3), get(params, 'message', ''))
-    endif
-  elseif has_key(a:agent.methods, request.method)
-    call timer_start(0, function('s:DispatchMessage', [a:agent, a:agent.methods[request.method], id, params]))
-  else
-    return s:Send(a:agent, {"id": id, "error": {"code": -32700, "message": "Method not found: " . request.method}})
+  if has_key(a:agent.methods, request.method)
+    return s:DispatchMessage(a:agent, a:agent.methods[request.method], id, params)
+  elseif !empty(id)
+    call s:Send(a:agent, {"id": id, "error": {"code": -32700, "message": "Method not found: " . request.method}})
   endif
 endfunction
 
@@ -285,20 +310,9 @@ function! s:OnExit(agent, code, ...) abort
   if has_key(a:agent, 'client_id')
     call remove(a:agent, 'client_id')
   endif
+  let code = a:code < 0 || a:code > 255 ? 256 : a:code
   for id in sort(keys(a:agent.requests), { a, b -> +a > +b })
-    let request = remove(a:agent.requests, id)
-    if request.status ==# 'canceled'
-      return
-    endif
-    let request.waiting = {}
-    call remove(request, 'resolve')
-    let reject = remove(request, 'reject')
-    let request.status = 'error'
-    let code = a:code < 0 || a:code > 255 ? 256 : a:code
-    let request.error = {'code': code, 'message': 'Agent exited', 'data': {'status': a:code}}
-    for Cb in reject
-      let request.waiting[timer_start(0, function('s:Callback', [request, 'error', Cb]))] = 1
-    endfor
+    call s:RejectRequest(remove(a:agent.requests, id), {'code': code, 'message': 'Agent exited', 'data': {'status': a:code}})
   endfor
   call timer_start(0, { _ -> get(s:instances, a:agent.id) is# a:agent ? remove(s:instances, a:agent.id) : {} })
   call copilot#logger#Info('agent exited with status ' . a:code)
@@ -353,7 +367,7 @@ function! copilot#agent#LspHandle(agent_id, request) abort
   if !has_key(s:instances, a:agent_id)
     return
   endif
-  call s:OnMessage(s:instances[a:agent_id], a:request)
+  return s:OnMessage(s:instances[a:agent_id], a:request)
 endfunction
 
 function! s:GetNodeVersion(command) abort
@@ -484,8 +498,6 @@ endfunction
 function! copilot#agent#New(...) abort
   let opts = a:0 ? a:1 : {}
   let instance = {'requests': {},
-        \ 'methods': get(opts, 'methods', {}),
-        \ 'notifications': get(opts, 'notifications', {}),
         \ 'editorConfiguration': get(opts, 'editorConfiguration', {}),
         \ 'Close': function('s:AgentClose'),
         \ 'Notify': function('s:AgentNotify'),
@@ -494,6 +506,10 @@ function! copilot#agent#New(...) abort
         \ 'Cancel': function('s:AgentCancel'),
         \ 'StartupError': function('s:AgentStartupError'),
         \ }
+  let instance.methods = extend({
+        \ 'LogMessage': function('s:LogMessage'),
+        \ 'window/logMessage': function('s:LogMessage'),
+        \ }, get(opts, 'methods', {}))
   let [command, node_version, command_error] = s:Command()
   if len(command_error)
     if empty(command)
@@ -510,7 +526,7 @@ function! copilot#agent#New(...) abort
         \ '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.client_id = v:lua.require'_copilot'.lsp_start_client(command, keys(instance.methods))
     let instance.id = instance.client_id
   else
     let state = {'headers': {}, 'mode': 'headers', 'buffer': ''}
@@ -525,7 +541,13 @@ function! copilot#agent#New(...) abort
           \ 'exit_cb': { j, d -> timer_start(0, function('s:OnExit', [instance, d])) },
           \ })
     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)
+    let capabilities = {'workspace': {'workspaceFolders': v:true}, 'copilot': {}}
+    for name in keys(instance.methods)
+      if name =~# '^copilot/'
+        let capabilities.copilot[matchstr(name, '/\zs.*')] = v:true
+      endif
+    endfor
+    let request = instance.Request('initialize', {'capabilities': capabilities}, function('s:GetCapabilitiesResult'), function('s:GetCapabilitiesError'), instance)
   endif
   let s:instances[instance.id] = instance
   return instance

autoload/copilot/logger.vim

@@ -55,14 +55,17 @@ function! copilot#logger#Exception() abort
     call copilot#logger#Error('Exception: ' . v:exception . ' @ ' . v:throwpoint)
     let agent = copilot#RunningAgent()
     if !empty(agent)
-      if v:throwpoint =~# '[\/]'
-        let throwpoint = '[redacted]'
-      else
-        let throwpoint = v:throwpoint
-      endif
+      let stacklines = []
+      for frame in split(substitute(substitute(v:throwpoint, ', \S\+ \(\d\+\)$', '[\1]', ''), '^function ', '', ''), '\.\@<!\.\.\.\@!')
+        if frame =~# '[\/]'
+          call add(stacklines, '[redacted]')
+        else
+          call add(stacklines, substitute(frame, '^<SNR>\d\+_', '<SID>', ''))
+        endif
+      endfor
       call agent.Request('telemetry/exception', {
             \ 'origin': 'copilot.vim',
-            \ 'stacktrace': v:exception . ' @ ' . throwpoint,
+            \ 'stacktrace': join([v:exception] + stacklines, "\n")
             \ })
     endif
   endif

autoload/copilot/panel.vim

@@ -3,6 +3,8 @@ if exists('g:autoloaded_copilot_panel')
 endif
 let g:autoloaded_copilot_panel = 1
 
+scriptencoding utf-8
+
 if !exists('s:panel_id')
   let s:panel_id = 0
 endif

dist/agent.js

@@ -1,20 +1,26 @@
 local copilot = {}
 
 copilot.lsp_start_client = function(cmd, handler_names)
+  local capabilities = vim.lsp.protocol.make_client_capabilities()
   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
+        if type(retval) == 'table' then return retval.result, retval.error end
       end
     end
+    if name:match('^copilot/') then
+      capabilities.copilot = capabilities.copilot or {}
+      capabilities.copilot[name:match('^copilot/(.*)$')] = true
+    end
   end
   id = vim.lsp.start_client({
     cmd = cmd,
     cmd_cwd = vim.call('copilot#job#Cwd'),
     name = 'copilot',
+    capabilities = capabilities,
     handlers = handlers,
     get_language_id = function(bufnr, filetype)
       return vim.call('copilot#doc#LanguageForFileType', filetype)