Copilot.vim 1.11.2

tpope · tpope · commit 0322dcf59452 · 2023-10-25T21:17:00.000-04:00
diff --git a/autoload/copilot.vim b/autoload/copilot.vim
@@ -173,8 +173,11 @@ function! s:BufferDisabled() abort
     return empty(b:copilot_enabled) ? 4 : 0
   endif
   let short = empty(&l:filetype) ? '.' : split(&l:filetype, '\.', 1)[0]
-  let config = get(g:, 'copilot_filetypes', {})
-  if type(config) == v:t_dict && has_key(config, &l:filetype)
+  let config = {}
+  if type(get(g:, 'copilot_filetypes')) == v:t_dict
+    let config = g:copilot_filetypes
+  endif
+  if has_key(config, &l:filetype)
     return empty(config[&l:filetype])
   elseif has_key(config, short)
     return empty(config[short])
diff --git a/autoload/copilot/agent.vim b/autoload/copilot/agent.vim
@@ -5,7 +5,7 @@ let g:autoloaded_copilot_agent = 1
 
 scriptencoding utf-8
 
-let s:plugin_version = '1.11.1'
+let s:plugin_version = '1.11.2'
 
 let s:error_exit = -1
 
@@ -58,14 +58,18 @@ function! s:AgentNotify(method, params) dict abort
   return v:true
 endfunction
 
+function! s:IsFinished(request) abort
+  return a:request.status !=# 'running' && empty(get(a:request, 'waiting', {}))
+endfunction
+
 function! s:RequestWait() dict abort
-  while self.status ==# 'running'
-    sleep 1m
-  endwhile
-  while !empty(get(self, 'waiting', {}))
-    sleep 1m
-  endwhile
-  return self
+  if exists('*wait')
+    call wait(-1, function('s:IsFinished', [self]), 2)
+  else
+    while !s:IsFinished(self)
+      sleep 2m
+    endwhile
+  endif
 endfunction
 
 function! s:RequestAwait() dict abort
@@ -423,7 +427,7 @@ function! s:Command() abort
   endif
   let node_version = s:GetNodeVersion(node)
   let warning = ''
-  if node_version.major < 18 && get(node, 0, '') !=# 'node' && executable('node')
+  if !get(g:, 'copilot_ignore_node_version') && 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'
@@ -506,10 +510,10 @@ function! s:GetCapabilitiesError(error, agent) abort
 endfunction
 
 function! s:AgentStartupError() dict abort
-  while has_key(self, 'job') && !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, 'capabilities')
     sleep 10m
   endwhile
-  if has_key(self, 'capabilities') || has_key(self, 'client_id')
+  if has_key(self, 'capabilities')
     return ''
   else
     return get(self, 'startup_error', 'Something unexpected went wrong spawning the agent')
diff --git a/autoload/copilot/logger.vim b/autoload/copilot/logger.vim
@@ -51,7 +51,7 @@ function! copilot#logger#Error(...) abort
 endfunction
 
 function! copilot#logger#Exception() abort
-  if !empty(v:exception)
+  if !empty(v:exception) && v:exception !=# 'Vim:Interrupt'
     call copilot#logger#Error('Exception: ' . v:exception . ' @ ' . v:throwpoint)
     let agent = copilot#RunningAgent()
     if !empty(agent)
diff --git a/dist/agent.js b/dist/agent.js
diff --git a/dist/agent.js.map b/dist/agent.js.map
diff --git a/lua/_copilot.lua b/lua/_copilot.lua
@@ -23,7 +23,9 @@ copilot.lsp_start_client = function(cmd, handler_names)
       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)
+      vim.schedule(function()
+        vim.call('copilot#agent#LspExit', client_id, code, signal)
+      end)
     end
   })
   return id
