Copilot.vim 1.12.0

Now with support for partially accepting suggestions.

Author: tpope

autoload/copilot.vim

@@ -459,11 +459,18 @@ function! copilot#Accept(...) abort
   let s = copilot#GetDisplayedSuggestion()
   if !empty(s.text)
     unlet! b:_copilot
-    call copilot#Request('notifyAccepted', {'uuid': s.uuid})
+    let text = ''
+    if a:0 > 1
+      let text = substitute(matchstr(s.text, "\n*" . '\%(' . a:2 .'\)'), "\n*$", '', '')
+    endif
+    if empty(text)
+      let text = s.text
+    endif
+    call copilot#Request('notifyAccepted', {'uuid': s.uuid, 'acceptedLength': copilot#doc#UTF16Width(text)})
     call s:ClearPreview()
-    let s:suggestion_text = s.text
+    let s:suggestion_text = text
     return repeat("\<Left>\<Del>", s.outdentSize) . repeat("\<Del>", s.deleteSize) .
-            \ "\<C-R>\<C-O>=copilot#TextQueuedForInsertion()\<CR>\<End>"
+            \ "\<C-R>\<C-O>=copilot#TextQueuedForInsertion()\<CR>" . (a:0 > 1 ? '' : "\<End>")
   endif
   let default = get(g:, 'copilot_tab_fallback', pumvisible() ? "\<C-N>" : "\t")
   if !a:0
@@ -481,19 +488,27 @@ function! copilot#Accept(...) abort
   endif
 endfunction
 
+function! copilot#AcceptWord(...) abort
+  return copilot#Accept(a:0 ? a:1 : '', '\%(\k\@!.\)*\k*')
+endfunction
+
+function! copilot#AcceptLine(...) abort
+  return copilot#Accept(a:0 ? a:1 : "\r", "[^\n]\\+")
+endfunction
+
 function! s:BrowserCallback(into, code) abort
   let a:into.code = a:code
 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']
-  elseif executable('gio')
-    return ['gio', 'open']
   elseif executable('xdg-open')
     return ['xdg-open']
   else

autoload/copilot/agent.vim

@@ -5,7 +5,7 @@ let g:autoloaded_copilot_agent = 1
 
 scriptencoding utf-8
 
-let s:plugin_version = '1.11.4'
+let s:plugin_version = '1.12.0'
 
 let s:error_exit = -1
 
@@ -44,13 +44,9 @@ function! s:LogSend(request, line) abort
   return '--> ' . a:line
 endfunction
 
-let s:chansend = function(exists('*chansend') ? 'chansend' : 'ch_sendraw')
 function! s:Send(agent, request) abort
-  let request = extend({'jsonrpc': '2.0'}, a:request, 'keep')
-  let body = json_encode(request)
-  call s:chansend(a:agent.job, "Content-Length: " . len(body) . "\r\n\r\n" . body)
-  call copilot#logger#Trace(function('s:LogSend', [request, body]))
-  return request
+  call ch_sendexpr(a:agent.job, a:request)
+  return a:request
 endfunction
 
 function! s:AgentNotify(method, params) dict abort
@@ -142,6 +138,12 @@ function! s:BufferText(bufnr) abort
   return join(getbufline(a:bufnr, 1, '$'), "\n") . "\n"
 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:AgentRequest(method, params, ...) dict abort
   let s:id += 1
   let request = {'method': a:method, 'params': deepcopy(a:params), 'id': s:id}
@@ -224,32 +226,28 @@ function! s:DispatchMessage(agent, handler, id, params, ...) abort
 endfunction
 
 function! s:OnMessage(agent, body, ...) abort
-  call copilot#logger#Trace({ -> '<-- ' . a:body})
-  let response = json_decode(a:body)
-  if type(response) != v:t_dict
-    return
+  if !has_key(a:body, 'method')
+    return s:OnResponse(a:agent, a:body)
+  endif
+  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}})
   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)
-    if empty(id)
-      if has_key(a:agent.notifications, response.method)
-        call timer_start(0, { _ -> a:agent.notifications[response.method](params) })
-      elseif response.method ==# 'LogMessage'
-        call copilot#logger#Raw(get(params, 'level', 3), get(params, 'message', ''))
-      endif
-    elseif has_key(a:agent.methods, response.method)
-      call timer_start(0, function('s:DispatchMessage', [a:agent, a:agent.methods[response.method], id, params]))
-    else
-      return s:Send(a:agent, {"id": id, "error": {"code": -32700, "message": "Method not found: " . response.method}})
-    endif
-    return
-  endif
+  let id = get(a:response, 'id', v:null)
   if !has_key(a:agent.requests, id)
     return
   endif
@@ -275,44 +273,11 @@ function! s:OnResponse(agent, response, ...) abort
   endif
 endfunction
 
-function! s:OnOut(agent, state, data) abort
-  let a:state.buffer .= a:data
-  while 1
-    if a:state.mode ==# 'body'
-      let content_length = a:state.headers['content-length']
-      if strlen(a:state.buffer) >= content_length
-        let headers = remove(a:state, 'headers')
-        let a:state.mode = 'headers'
-        let a:state.headers = {}
-        let body = strpart(a:state.buffer, 0, content_length)
-        let a:state.buffer = strpart(a:state.buffer, content_length)
-        call timer_start(0, function('s:OnMessage', [a:agent, body]))
-      else
-        return
-      endif
-    elseif a:state.mode ==# 'headers' && a:state.buffer =~# "\n"
-      let line = matchstr(a:state.buffer, "^.[^\n]*")
-      let a:state.buffer = strpart(a:state.buffer, strlen(line) + 1)
-      let match = matchlist(line, '^\([^:]\+\): \(.\{-\}\)\r$')
-      if len(match)
-        let a:state.headers[tolower(match[1])] = match[2]
-      elseif line =~# "^\r\\=$"
-        let a:state.mode = 'body'
-      else
-        call copilot#logger#Error("Invalid header: " . line)
-        call a:agent.Close()
-      endif
-    else
-      return
-    endif
-  endwhile
-endfunction
-
-function! s:OnErr(agent, line) abort
+function! s:OnErr(agent, line, ...) abort
   call copilot#logger#Debug('<-! ' . a:line)
 endfunction
 
-function! s:OnExit(agent, code) abort
+function! s:OnExit(agent, code, ...) abort
   let a:agent.exit_status = a:code
   if has_key(a:agent, 'job')
     call remove(a:agent, 'job')
@@ -384,11 +349,11 @@ 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
+function! copilot#agent#LspHandle(agent_id, request) abort
   if !has_key(s:instances, a:agent_id)
     return
   endif
-  call s:OnResponse(s:instances[a:agent_id], a:response)
+  call s:OnMessage(s:instances[a:agent_id], a:request)
 endfunction
 
 function! s:GetNodeVersion(command) abort
@@ -550,10 +515,15 @@ function! copilot#agent#New(...) abort
   else
     let state = {'headers': {}, 'mode': 'headers', 'buffer': ''}
     let instance.open_buffers = {}
-    let instance.job = copilot#job#Stream(command,
-          \ function('s:OnOut', [instance, state]),
-          \ function('s:OnErr', [instance]),
-          \ function('s:OnExit', [instance]))
+    let instance.methods = extend({'window/showMessageRequest': function('s:ShowMessageRequest')}, instance.methods)
+    let instance.job = job_start(command, {
+          \ 'cwd': copilot#job#Cwd(),
+          \ 'in_mode': 'lsp',
+          \ 'out_mode': 'lsp',
+          \ 'out_cb': { j, d -> timer_start(0, function('s:OnMessage', [instance, d])) },
+          \ 'err_cb': { j, d -> timer_start(0, function('s:OnErr', [instance, d])) },
+          \ '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)
   endif

autoload/copilot/job.vim

@@ -70,20 +70,24 @@ function! s:NvimExitCallback(out_cb, err_cb, exit_cb, job, data, type) dict abor
   call a:exit_cb(a:data)
 endfunction
 
+function! copilot#job#Cwd() abort
+  let home = expand("~")
+  if !isdirectory(home) && isdirectory($VIM)
+    return $VIM
+  endif
+  return home
+endfunction
+
 function! copilot#job#Stream(argv, out_cb, err_cb, ...) abort
   let exit_status = []
   let ExitCb = function(a:0 && !empty(a:1) ? a:1 : { e -> add(exit_status, e) }, a:000[2:-1])
   let OutCb = function(empty(a:out_cb) ? 'copilot#job#Nop' : a:out_cb, a:000[2:-1])
   let ErrCb = function(empty(a:err_cb) ? 'copilot#job#Nop' : a:err_cb, a:000[2:-1])
   let state = {'headers': {}, 'mode': 'headers', 'buffer': ''}
-  let cwd = expand("~")
-  if !isdirectory(cwd) && isdirectory($VIM)
-    let cwd = $VIM
-  endif
   if exists('*job_start')
     let result = {}
     let job = job_start(a:argv, {
-          \ 'cwd': cwd,
+          \ 'cwd': copilot#job#Cwd(),
           \ 'out_mode': 'raw',
           \ 'out_cb': { j, d -> OutCb(d) },
           \ 'err_cb': { j, d -> ErrCb(d) },
@@ -92,7 +96,7 @@ function! copilot#job#Stream(argv, out_cb, err_cb, ...) abort
           \ })
   else
     let jopts = {
-          \ 'cwd': cwd,
+          \ 'cwd': copilot#job#Cwd(),
           \ 'stderr': [''],
           \ 'on_stdout': { j, d, t -> OutCb(join(d, "\n")) },
           \ 'on_stderr': function('s:NvimCallback', [ErrCb]),

autoload/copilot/panel.vim

@@ -85,8 +85,13 @@ function! copilot#panel#Accept(...) abort
       return 'echoerr "Buffer has changed since synthesizing solution"'
     endif
     let lines = split(solution.displayText, "\n", 1)
+    let old_first = getline(solution.range.start.line + 1)
+    let lines[0] = strpart(old_first, 0, copilot#doc#UTF16ToByteIdx(old_first, solution.range.start.character)) . lines[0]
+    let old_last = getline(solution.range.end.line + 1)
+    let lines[-1] .= strpart(old_last, copilot#doc#UTF16ToByteIdx(old_last, solution.range.start.character))
     call setbufline(state.bufnr, solution.range.start.line + 1, lines[0])
     call appendbufline(state.bufnr, solution.range.start.line + 1, lines[1:-1])
+    call copilot#Request('notifyAccepted', {'uuid': solution.solutionId})
     bwipeout
     let win = bufwinnr(state.bufnr)
     if win > 0

dist/agent.js

@@ -104,12 +104,33 @@ copilot#Accept().  Here's an example with CTRL-J:
         imap <silent><script><expr> <C-J> copilot#Accept("\<CR>")
         let g:copilot_no_tab_map = v:true
 <
+Lua version:
+>
+        vim.keymap.set('i', '<C-J>', 'copilot#Accept("\<CR>")', {
+          expr = true,
+          replace_keycodes = false
+        })
+        vim.g.copilot_no_tab_map = true
+<
 The argument to copilot#Accept() is the fallback for when no suggestion is
 displayed.  In this example, a regular carriage return is used.  If no
 fallback is desired, use an argument of "" (an empty string).
 
 Other Maps ~
 
+Note that M- (a.k.a. meta or alt) maps are highly dependent on your terminal
+to function correctly and may be unsupported with your setup.  As an
+alternative, you can create your own versions that invoke the <Plug> maps
+instead.  Here's an example that maps CTRL-L to accept one word of the
+current suggestion:
+>
+        imap <C-L> <Plug>(copilot-accept-word)
+<
+Lua version:
+>
+        vim.keymap.set('i', '<C-L>', '<Plug>(copilot-accept-word)')
+<
+
                                                 *copilot-i_CTRL-]*
 <C-]>                   Dismiss the current suggestion.
 <Plug>(copilot-dismiss)
@@ -126,6 +147,15 @@ Other Maps ~
 <M-\>                   Explicitly request a suggestion, even if Copilot
 <Plug>(copilot-suggest) is disabled.
 
+                                                *copilot-i_ALT-Right*
+<M-Right>               Accept the next word of the current suggestion.
+<Plug>(copilot-accept-word)
+
+                                                *copilot-i_ALT-CTRL-Right*
+
+<M-C-Right>             Accept the next line of the current suggestion.
+<Plug>(copilot-accept-line)
+
 SYNTAX HIGHLIGHTING                             *copilot-highlighting*
 
 Inline suggestions are highlighted using the CopilotSuggestion group,

dist/agent.js.map

@@ -13,7 +13,7 @@ copilot.lsp_start_client = function(cmd, handler_names)
   end
   id = vim.lsp.start_client({
     cmd = cmd,
-    cmd_cwd = vim.fn.expand('~'),
+    cmd_cwd = vim.call('copilot#job#Cwd'),
     name = 'copilot',
     handlers = handlers,
     get_language_id = function(bufnr, filetype)
@@ -35,10 +35,9 @@ copilot.lsp_request = function(client_id, method, params)
   local client = vim.lsp.get_client_by_id(client_id)
   if not client then return end
   vim.lsp.buf_attach_client(0, client_id)
-  local bufnr
   for _, doc in ipairs({params.doc, params.textDocument}) do
     if doc and type(doc.uri) == 'number' then
-      bufnr = doc.uri
+      local bufnr = doc.uri
       vim.lsp.buf_attach_client(bufnr, client_id)
       doc.uri = vim.uri_from_bufnr(bufnr)
       doc.version = vim.lsp.util.buf_versions[bufnr]
@@ -47,7 +46,7 @@ copilot.lsp_request = function(client_id, method, params)
   local _, id
   _, id = client.request(method, params, function(err, result)
     vim.call('copilot#agent#LspResponse', client_id, {id = id, error = err, result = result})
-  end, bufnr)
+  end)
   return id
 end
 

doc/copilot.txt

@@ -75,6 +75,8 @@ if !get(g:, 'copilot_no_maps')
   imap <Plug>(copilot-next)     <Cmd>call copilot#Next()<CR>
   imap <Plug>(copilot-previous) <Cmd>call copilot#Previous()<CR>
   imap <Plug>(copilot-suggest)  <Cmd>call copilot#Suggest()<CR>
+  imap <script><silent><nowait><expr> <Plug>(copilot-accept-word) copilot#AcceptWord()
+  imap <script><silent><nowait><expr> <Plug>(copilot-accept-line) copilot#AcceptLine()
   try
     if !has('nvim') && &encoding ==# 'utf-8'
       " avoid 8-bit meta collision with UTF-8 characters
@@ -90,6 +92,12 @@ if !get(g:, 'copilot_no_maps')
     if empty(mapcheck('<M-Bslash>', 'i'))
       imap <M-Bslash> <Plug>(copilot-suggest)
     endif
+    if empty(mapcheck('<M-Right>', 'i'))
+      imap <M-Right> <Plug>(copilot-accept-word)
+    endif
+    if empty(mapcheck('<M-Down>', 'i'))
+      imap <M-Down> <Plug>(copilot-accept-line)
+    endif
   finally
     if exists('s:restore_encoding')
       set encoding=utf-8