Copilot.vim 1.14.0

Author: tpope

autoload/copilot.vim

@@ -1,8 +1,3 @@
-if exists('g:autoloaded_copilot')
-  finish
-endif
-let g:autoloaded_copilot = 1
-
 scriptencoding utf-8
 
 let s:has_nvim_ghost_text = has('nvim-0.6') && exists('*nvim_buf_get_mark')
@@ -400,10 +395,10 @@ endfunction
 
 function! s:Trigger(bufnr, timer) abort
   let timer = get(g:, '_copilot_timer', -1)
-  unlet! g:_copilot_timer
   if a:bufnr !=# bufnr('') || a:timer isnot# timer || mode() !=# 'i'
     return
   endif
+  unlet! g:_copilot_timer
   return copilot#Suggest()
 endfunction
 
@@ -419,6 +414,7 @@ function! copilot#Schedule(...) abort
   endif
   call s:UpdatePreview()
   let delay = a:0 ? a:1 : get(g:, 'copilot_idle_delay', 15)
+  call timer_stop(get(g:, '_copilot_timer', -1))
   let g:_copilot_timer = timer_start(delay, function('s:Trigger', [bufnr('')]))
 endfunction
 
@@ -713,9 +709,10 @@ function! s:commands.version(opts) abort
   let info = copilot#agent#EditorInfo()
   echo 'copilot.vim ' .info.editorPluginInfo.version
   echo info.editorInfo.name . ' ' . info.editorInfo.version
-  if exists('s:agent.node_version')
-    echo 'dist/agent.js ' . s:agent.Call('getVersion', {}).version
-    echo 'Node.js ' . s:agent.node_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'))
     call s:NodeVersionWarning()
   else
     echo 'dist/agent.js not running'

autoload/copilot/agent.vim

@@ -1,11 +1,6 @@
-if exists('g:autoloaded_copilot_agent')
-  finish
-endif
-let g:autoloaded_copilot_agent = 1
-
 scriptencoding utf-8
 
-let s:plugin_version = '1.13.0'
+let s:plugin_version = '1.14.0'
 
 let s:error_exit = -1
 
@@ -86,7 +81,7 @@ function! s:RequestAwait() dict abort
   if has_key(self, 'result')
     return self.result
   endif
-  throw 'copilot#agent(' . self.error.code . '): ' . self.error.message
+  throw 'copilot#agent:E' . self.error.code . ': ' . self.error.message
 endfunction
 
 function! s:RequestAgent() dict abort
@@ -240,14 +235,14 @@ function! s:RequestCancel() dict abort
   return self
 endfunction
 
-function! s:DispatchMessage(agent, handler, id, params, ...) abort
+function! s:DispatchMessage(agent, method, 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()
+    call copilot#logger#Exception('lsp.request.' . a:method)
     let response = {'error': {'code': -32000, 'message': v:exception}}
   endtry
   if !empty(a:id)
@@ -264,7 +259,7 @@ function! s:OnMessage(agent, body, ...) abort
   let id = get(request, 'id', v:null)
   let params = get(request, 'params', v:null)
   if has_key(a:agent.methods, request.method)
-    return s:DispatchMessage(a:agent, a:agent.methods[request.method], id, params)
+    return s:DispatchMessage(a:agent, request.method, 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
@@ -387,6 +382,13 @@ function! s:Command() abort
   if !has('nvim-0.6') && v:version < 900
     return [v:null, '', 'Vim version too old']
   endif
+  let agent = get(g:, 'copilot_agent_command', '')
+  if empty(agent) || !filereadable(agent)
+    let agent = s:root . '/dist/agent.js'
+    if !filereadable(agent)
+      return [v:null, '', 'Could not find dist/agent.js (bad install?)']
+    endif
+  endif
   let node = get(g:, 'copilot_node_command', '')
   if empty(node)
     let node = ['node']
@@ -400,9 +402,12 @@ function! s:Command() abort
       return [v:null, '', 'Node.js executable `' . get(node, 0, '') . "' not found"]
     endif
   endif
+  if get(g:, 'copilot_ignore_node_version')
+    return [node + [agent, '--stdio'], '', '']
+  endif
   let node_version = s:GetNodeVersion(node)
   let warning = ''
-  if !get(g:, 'copilot_ignore_node_version') && node_version.major < 18 && get(node, 0, '') !=# 'node' && executable('node')
+  if node_version.major < 18 && get(node, 0, '') !=# 'node' && executable('node')
     let node_version_from_path = s:GetNodeVersion(['node'])
     if node_version_from_path.major >= 18
       let warning = 'Ignoring g:copilot_node_command: Node.js ' . node_version.string . ' is end-of-life'
@@ -421,13 +426,6 @@ function! s:Command() abort
       return [v:null, node_version.string, 'Node.js version 18.x or newer required but found ' . node_version.string]
     endif
   endif
-  let agent = get(g:, 'copilot_agent_command', '')
-  if empty(agent) || !filereadable(agent)
-    let agent = s:root . '/dist/agent.js'
-    if !filereadable(agent)
-      return [v:null, node_version.string, 'Could not find dist/agent.js (bad install?)']
-    endif
-  endif
   return [node + [agent, '--stdio'], node_version.string, warning]
 endfunction
 
@@ -520,7 +518,9 @@ function! copilot#agent#New(...) abort
       let instance.node_version_warning = command_error
     endif
   endif
-  let instance.node_version = node_version
+  if !empty(node_version)
+    let instance.node_version = node_version
+  endif
   if has('nvim')
     call extend(instance, {
         \ 'Close': function('s:LspClose'),

autoload/copilot/doc.vim

@@ -1,13 +1,8 @@
-if exists('g:autoloaded_copilot_prompt')
-  finish
-endif
-let g:autoloaded_copilot_prompt = 1
-
 scriptencoding utf-8
 
 let s:slash = exists('+shellslash') ? '\' : '/'
 
-function copilot#doc#UTF16Width(str) abort
+function! copilot#doc#UTF16Width(str) abort
   return strchars(substitute(a:str, "\\%#=2[^\u0001-\uffff]", "  ", 'g'))
 endfunction
 
@@ -60,7 +55,7 @@ let s:language_normalization_map = {
       \ "sh":              "shellscript",
       \ "text":            "plaintext",
       \ }
-function copilot#doc#LanguageForFileType(filetype) abort
+function! copilot#doc#LanguageForFileType(filetype) abort
   let filetype = substitute(a:filetype, '\..*', '', '')
   return get(s:language_normalization_map, empty(filetype) ? "text" : filetype, filetype)
 endfunction

autoload/copilot/job.vim

@@ -1,11 +1,6 @@
-if exists('g:autoloaded_copilot_job')
-  finish
-endif
-let g:autoloaded_copilot_job = 1
-
 scriptencoding utf-8
 
-function copilot#job#Nop(...) abort
+function! copilot#job#Nop(...) abort
 endfunction
 
 function! s:Jobs(job_or_jobs) abort

autoload/copilot/logger.vim

@@ -1,8 +1,3 @@
-if exists('g:autoloaded_copilot_log')
-  finish
-endif
-let g:autoloaded_copilot_log = 1
-
 if !exists('s:log_file')
   let s:log_file = tempname() . '-copilot.log'
   try
@@ -50,22 +45,32 @@ function! copilot#logger#Error(...) abort
   call copilot#logger#Raw(3, a:000)
 endfunction
 
-function! copilot#logger#Exception() abort
+function! copilot#logger#Exception(...) abort
   if !empty(v:exception) && v:exception !=# 'Vim:Interrupt'
     call copilot#logger#Error('Exception: ' . v:exception . ' @ ' . v:throwpoint)
     let agent = copilot#RunningAgent()
     if !empty(agent)
+      let [_, type, code, message; __] = matchlist(v:exception, '^\%(\(^[[:alnum:]_#]\+\)\%((\a\+)\)\=\%(\(:E-\=\d\+\)\)\=:\s*\)\=\(.*\)$')
       let stacklines = []
-      for frame in split(substitute(substitute(v:throwpoint, ', \S\+ \(\d\+\)$', '[\1]', ''), '^function ', '', ''), '\.\@<!\.\.\.\@!')
-        if frame =~# '[\/]'
-          call add(stacklines, '[redacted]')
+      for frame in split(substitute(v:throwpoint, ', \S\+ \(\d\+\)$', '[\1]', ''), '\.\@<!\.\.\.\@!')
+        let fn_line = matchlist(frame, '^\%(function \)\=\(\S\+\)\[\(\d+\)\]$')
+        if !empty(fn_line)
+          call add(stacklines, {'function': substitute(fn_line[1], '^<SNR>\d\+_', '<SID>', ''), 'lineno': +fn_line[2]})
+        elseif frame =~# ' Autocmds for "\*"$'
+          call add(stacklines, {'function': frame})
+        elseif frame =~# ' Autocmds for ".*"$'
+          call add(stacklines, {'function': substitute(frame, ' for ".*"$', ' for "[redacted]"', '')})
         else
-          call add(stacklines, substitute(frame, '^<SNR>\d\+_', '<SID>', ''))
+          call add(stacklines, {'function': '[redacted]'})
         endif
       endfor
-      call agent.Request('telemetry/exception', {
-            \ 'origin': 'copilot.vim',
-            \ 'stacktrace': join([v:exception] + stacklines, "\n")
+      return agent.Request('telemetry/exception', {
+            \ 'origin': a:0 ? a:1 : 'none',
+            \ 'platform': 'other',
+            \ 'exception_detail': [{
+            \ 'type': type . code,
+            \ 'value': message,
+            \ 'stacktrace': stacklines}]
             \ })
     endif
   endif

autoload/copilot/panel.vim

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

dist/agent.js

@@ -106,7 +106,7 @@ copilot#Accept().  Here's an example with CTRL-J:
 <
 Lua version:
 >
-        vim.keymap.set('i', '<C-J>', 'copilot#Accept("\<CR>")', {
+        vim.keymap.set('i', '<C-J>', 'copilot#Accept("\\<CR>")', {
           expr = true,
           replace_keycodes = false
         })

dist/agent.js.map

@@ -40,11 +40,11 @@ end
 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)
+  pcall(vim.lsp.buf_attach_client, 0, client_id)
   for _, doc in ipairs({params.doc, params.textDocument}) do
     if doc and type(doc.uri) == 'number' then
       local bufnr = doc.uri
-      vim.lsp.buf_attach_client(bufnr, client_id)
+      pcall(vim.lsp.buf_attach_client, bufnr, client_id)
       doc.uri = vim.uri_from_bufnr(bufnr)
       doc.version = vim.lsp.util.buf_versions[bufnr]
     end