Copilot.vim 1.20.0

Author: tpope

autoload/copilot.vim

@@ -59,7 +59,6 @@ function! s:Start() abort
         \ 'statusNotification': function('s:StatusNotification'),
         \ 'PanelSolution': function('copilot#panel#Solution'),
         \ 'PanelSolutionsDone': function('copilot#panel#SolutionsDone'),
-        \ 'copilot/openURL': function('s:OpenURL'),
         \ },
         \ 'editorConfiguration' : s:EditorConfiguration()})
 endfunction
@@ -518,21 +517,6 @@ function! copilot#Browser() abort
   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 = {}
 
 function! s:EnabledStatusMessage() abort
@@ -705,12 +689,20 @@ function! s:commands.version(opts) abort
   let editorInfo = copilot#agent#EditorInfo()
   echo editorInfo.name . ' ' . editorInfo.version
   if s:Running()
-    let versions = s:agent.Call('getVersion', {})
-    echo 'dist/agent.js ' . versions.version
-    echo 'Node.js ' . get(s:agent, 'node_version', substitute(get(versions, 'runtimeVersion', '?'), '^node/', '', 'g'))
+    let versions = s:agent.Request('getVersion', {})
+    if exists('s:agent.serverInfo.version')
+      echo s:agent.serverInfo.name . ' ' . s:agent.serverInfo.version
+    else
+      echo 'dist/agent.js ' . versions.Await().version
+    endif
+    if exists('s:agent.node_version')
+      echo 'Node.js ' . s:agent.node_version
+    else
+      echo 'Node.js ' . substitute(get(versions.Await(), 'runtimeVersion', '?'), '^node/', '', 'g')
+    endif
     call s:NodeVersionWarning()
   else
-    echo 'dist/agent.js not running'
+    echo 'Not running'
   endif
 endfunction
 

autoload/copilot/agent.vim

@@ -145,16 +145,6 @@ 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, 'type', 6), 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'})
@@ -198,7 +188,11 @@ function! s:AgentRequest(method, params, ...) dict abort
     endif
     let doc.version = doc_version
   endfor
-  call timer_start(0, { _ -> s:SendRequest(self, request) })
+  if has_key(self, 'initialization_pending')
+    call add(self.initialization_pending, request)
+  else
+    call timer_start(0, { _ -> s:SendRequest(self, request) })
+  endif
   return call('s:SetUpRequest', [self, s:id, a:method, a:params] + a:000)
 endfunction
 
@@ -255,8 +249,10 @@ function! s:OnMessage(agent, body, ...) abort
   let params = get(request, 'params', v:null)
   if has_key(a:agent.methods, request.method)
     return s:DispatchMessage(a:agent, request.method, a:agent.methods[request.method], id, params)
-  elseif !empty(id)
+  elseif id isnot# v:null
     call s:Send(a:agent, {"id": id, "error": {"code": -32700, "message": "Method not found: " . request.method}})
+  elseif request.method !~# '^\$/'
+    call copilot#logger#Warn('Unexpected notification ' . request.method . ' called with ' . json_encode(params))
   endif
 endfunction
 
@@ -289,7 +285,7 @@ function! s:OnResponse(agent, response, ...) abort
 endfunction
 
 function! s:OnErr(agent, line, ...) abort
-  if !has_key(a:agent, 'capabilities')
+  if !has_key(a:agent, 'serverInfo')
     call copilot#logger#Bare('<-! ' . a:line)
   endif
 endfunction
@@ -467,12 +463,22 @@ function! copilot#agent#Settings() abort
 endfunction
 
 function! s:InitializeResult(result, agent) abort
-  let a:agent.capabilities = get(a:result, 'capabilities', {})
+  let a:agent.serverInfo = get(a:result, 'serverInfo', {})
+  if !has_key(a:agent, 'node_version') && has_key(a:result.serverInfo, 'nodeVersion')
+    let a:agent.node_version = a:result.serverInfo.nodeVersion
+  endif
   let info = {
         \ 'editorInfo': copilot#agent#EditorInfo(),
         \ 'editorPluginInfo': copilot#agent#EditorPluginInfo(),
         \ 'editorConfiguration': extend(copilot#agent#Settings(), a:agent.editorConfiguration)}
+  let pending = get(a:agent, 'initialization_pending', [])
+  if has_key(a:agent, 'initialization_pending')
+    call remove(a:agent, 'initialization_pending')
+  endif
   call a:agent.Request('setEditorInfo', info)
+  for request in pending
+    call timer_start(0, { _ -> s:SendRequest(a:agent, request) })
+  endfor
 endfunction
 
 function! s:InitializeError(error, agent) abort
@@ -485,16 +491,26 @@ function! s:InitializeError(error, agent) abort
 endfunction
 
 function! s:AgentStartupError() dict abort
-  while (has_key(self, 'job') || has_key(self, 'client_id')) && !has_key(self, 'startup_error') && !has_key(self, 'capabilities')
+  while (has_key(self, 'job') || has_key(self, 'client_id')) && !has_key(self, 'startup_error') && !has_key(self, 'serverInfo')
     sleep 10m
   endwhile
-  if has_key(self, 'capabilities')
+  if has_key(self, 'serverInfo')
     return ''
   else
     return get(self, 'startup_error', 'Something unexpected went wrong spawning the agent')
   endif
 endfunction
 
+let s:vim_handlers = {
+      \ 'window/showMessageRequest': function('copilot#handlers#window_showMessageRequest'),
+      \ 'window/showDocument': function('copilot#handlers#window_showDocument'),
+      \ }
+
+let s:vim_capabilities = {
+      \ 'workspace': {'workspaceFolders': v:true},
+      \ 'window': {'showDocument': {'support': v:true}},
+      \ }
+
 function! copilot#agent#New(...) abort
   let opts = a:0 ? a:1 : {}
   let instance = {'requests': {},
@@ -507,7 +523,7 @@ function! copilot#agent#New(...) abort
         \ 'StartupError': function('s:AgentStartupError'),
         \ }
   let instance.methods = extend({
-        \ 'window/logMessage': function('s:LogMessage'),
+        \ 'window/logMessage': function('copilot#handlers#window_logMessage'),
         \ }, get(opts, 'methods', {}))
   let [command, node_version, command_error] = s:Command()
   if len(command_error)
@@ -522,23 +538,18 @@ function! copilot#agent#New(...) abort
   if !empty(node_version)
     let instance.node_version = node_version
   endif
-  let initializationOptions = {'copilotCapabilities': {}}
-  for name in keys(instance.methods)
-    if name =~# '^copilot/'
-      let initializationOptions.copilotCapabilities[matchstr(name, '/\zs.*')] = v:true
-    endif
-  endfor
+  let opts = {'initializationOptions': {}}
   if has('nvim')
     call extend(instance, {
         \ 'Close': function('s:LspClose'),
         \ 'Notify': function('s:LspNotify'),
         \ 'Request': function('s:LspRequest')})
-    let instance.client_id = eval("v:lua.require'_copilot'.lsp_start_client(command, keys(instance.methods), initializationOptions)")
+    let instance.client_id = eval("v:lua.require'_copilot'.lsp_start_client(command, keys(instance.methods), opts)")
     let instance.id = instance.client_id
   else
     let state = {'headers': {}, 'mode': 'headers', 'buffer': ''}
     let instance.open_buffers = {}
-    let instance.methods = extend({'window/showMessageRequest': function('s:ShowMessageRequest')}, instance.methods)
+    let instance.methods = extend(s:vim_handlers, instance.methods)
     let instance.job = job_start(command, {
           \ 'cwd': copilot#job#Cwd(),
           \ 'in_mode': 'lsp',
@@ -548,12 +559,10 @@ function! copilot#agent#New(...) abort
           \ 'exit_cb': { j, d -> timer_start(0, function('s:OnExit', [instance, d])) },
           \ })
     let instance.id = job_info(instance.job).process
-    let opts = {
-          \ 'capabilities': {'workspace': {'workspaceFolders': v:true}},
-          \ 'initializationOptions': initializationOptions,
-          \ 'processId': getpid(),
-          \ }
+    let opts.capabilities = s:vim_capabilities
+    let opts.processId = getpid()
     let request = instance.Request('initialize', opts, function('s:InitializeResult'), function('s:InitializeError'), instance)
+    let instance.initialization_pending = []
   endif
   let s:instances[instance.id] = instance
   return instance

autoload/copilot/handlers.vim

@@ -0,0 +1,31 @@
+function! copilot#handlers#window_logMessage(params) abort
+  call copilot#logger#Raw(get(a:params, 'type', 6), get(a:params, 'message', ''))
+endfunction
+
+function! copilot#handlers#window_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:BrowserCallback(into, code) abort
+  let a:into.code = a:code
+endfunction
+
+function! copilot#handlers#window_showDocument(params) abort
+  echo a:params.uri
+  if empty(get(a:params, 'external'))
+    return {'success': v:false}
+  endif
+  let browser = copilot#Browser()
+  if empty(browser)
+    return {'success': v:false}
+  endif
+  let status = {}
+  call copilot#job#Stream(browser + [a:params.uri], v:null, v:null, function('s:BrowserCallback', [status]))
+  let time = reltime()
+  while empty(status) && reltimefloat(reltime(time)) < 1
+    sleep 10m
+  endwhile
+  return {'success': get(status, 'code') ? v:false : v:true}
+endfunction

autoload/copilot/version.vim

@@ -1,3 +1,3 @@
 function! copilot#version#String() abort
-  return '1.19.2'
+  return '1.20.0'
 endfunction

dist/agent.js

@@ -1,7 +1,15 @@
 local copilot = {}
 
-copilot.lsp_start_client = function(cmd, handler_names, init_options)
-  local handlers = {}
+local showDocument = function(err, result, ctx, _)
+  if result.external and vim.g.copilot_browser then
+    return vim.fn['copilot#handlers#window_showDocument'](result.uri)
+  else
+    return vim.lsp.handlers['window/showDocument'](err, result, ctx, _)
+  end
+end
+
+copilot.lsp_start_client = function(cmd, handler_names, opts)
+  local handlers = {['window/showDocument'] = showDocument}
   local id
   for _, name in ipairs(handler_names) do
     handlers[name] = function(err, result)
@@ -17,7 +25,7 @@ copilot.lsp_start_client = function(cmd, handler_names, init_options)
     cmd = cmd,
     cmd_cwd = vim.call('copilot#job#Cwd'),
     name = 'copilot',
-    init_options = init_options,
+    init_options = opts.initializationOptions,
     handlers = handlers,
     get_language_id = function(bufnr, filetype)
       return vim.call('copilot#doc#LanguageForFileType', filetype)

dist/agent.js.map

@@ -96,7 +96,7 @@ if !get(g:, 'copilot_no_maps')
       imap <M-Right> <Plug>(copilot-accept-word)
     endif
     if empty(mapcheck('<M-C-Right>', 'i'))
-      imap <M-Down> <Plug>(copilot-accept-line)
+      imap <M-C-Right> <Plug>(copilot-accept-line)
     endif
   finally
     if exists('s:restore_encoding')