Copilot.vim 1.25.1

Author: tpope

autoload/copilot.vim

@@ -44,7 +44,7 @@ function! s:StatusNotification(params, ...) abort
 endfunction
 
 function!copilot#Init(...) abort
-calltimer_start(0,{_-> exists('s:agent') ||s:Start() })
+callcopilot#util#Defer({-> exists('s:agent') ||s:Start() })
 endfunction
 
 function!s:Running() abort
@@ -442,7 +442,7 @@ endfunction
 
 function!copilot#OnFileType() abort
 ifempty(s:BufferDisabled()) && &l:modifiable&& &l:buflisted
-calltimer_start(0, function('s:Attach', [bufnr('')]))
+callcopilot#util#Defer(function('s:Attach'), bufnr(''))
 endif
 endfunction
 
@@ -454,7 +454,7 @@ endfunction
 
 function!copilot#OnBufEnter() abort
 letbufnr=bufnr('')
-calltimer_start(0,{_ -> timer_start(0, function('s:Focus', [bufnr]))})
+callcopilot#util#Defer(function('s:Focus'), bufnr)
 endfunction
 
 function!copilot#OnInsertLeave() abort
@@ -676,8 +676,14 @@ function! s:commands.setup(opts) abort
 ifhas_key(data, 'verificationUri')
 let uri = data.verificationUri
 ifhas('clipboard')
-let@+= data.userCode
-let@*= data.userCode
+try
+let@+= data.userCode
+catch
+endtry
+try
+let@*= data.userCode
+catch
+endtry
 endif
 let codemsg ="First copy your one-time code: " . data.userCode . "\n"
 try

autoload/copilot/agent.vim

@@ -240,7 +240,7 @@ function! s:AgentRequest(method, params, ...) dict abort
 ifhas_key(self, 'initialization_pending')
 calladd(self.initialization_pending, request)
 else
-calltimer_start(0,{_ -> s:SendRequest(self, request) })
+callcopilot#util#Defer(function('s:SendRequest'), self, request)
 endif
 returncall('s:SetUpRequest', [self, s:id, a:method, params] +a:000)
 endfunction
@@ -330,7 +330,7 @@ function! s:OnResponse(agent, response, ...) abort
 endif
 endfunction
 
-function!s:OnErr(agent, line, ...) abort
+function!s:OnErr(agent, ch, line, ...) abort
 if!has_key(a:agent, 'serverInfo')
 callcopilot#logger#Bare('<-! ' . a:line)
 endif
@@ -348,7 +348,7 @@ function! s:OnExit(agent, code, ...) abort
 for id insort(keys(a:agent.requests),{a, b-> +a > +b })
 calls:RejectRequest(remove(a:agent.requests, id),{'code': code, 'message': 'Agent exited', 'data':{'status': a:code}})
 endfor
-calltimer_start(0,{_-> get(s:instances, a:agent.id) is# a:agent ? remove(s:instances, a:agent.id) :{} })
+callcopilot#util#Defer({-> get(s:instances, a:agent.id) is# a:agent ? remove(s:instances, a:agent.id) :{} })
 callcopilot#logger#Info('Agent exited with status ' . a:code)
 endfunction
 
@@ -532,7 +532,7 @@ function! s:InitializeResult(result, agent) abort
 calls:AfterInitialize(a:result, a:agent)
 calls:Send(a:agent,{'method': 'initialized', 'params':{}})
 for request inremove(a:agent, 'initialization_pending')
-calltimer_start(0, function('s:SendRequest', [a:agent, request]))
+callcopilot#util#Defer(function('s:SendRequest'), a:agent, request)
 endfor
 endfunction
 
@@ -646,9 +646,9 @@ function! copilot#agent#New(...) abort
 \ 'stoponexit': '',
 \ '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])) },
+\ 'out_cb':{j, d-> copilot#util#Defer(function('s:OnMessage'), instance, d) },
+\ 'err_cb': function('s:OnErr', [instance]),
+\ 'exit_cb':{j, d-> copilot#util#Defer(function('s:OnExit'), instance, d) },
 \ })
 let instance.id =job_info(instance.job).process
 let opts.capabilities =s:vim_capabilities

autoload/copilot/logger.vim

@@ -20,12 +20,9 @@ function! copilot#logger#BufReadCmd() abort
 endtry
 endfunction
 
-lets:level_prefixes= ['', '[ERROR] ', '[WARN] ', '[INFO] ', '[DEBUG] ', '[TRACE] ']
+lets:level_prefixes= ['', '[ERROR] ', '[WARN] ', '[INFO] ', '[DEBUG] ', '[DEBUG] ']
 
 function!copilot#logger#Raw(level, message) abort
-if$COPILOT_AGENT_VERBOSE!~#'^\%(1\|true\)$'&&a:level > 3
-return
-endif
 letlines=type(a:message) ==v:t_list ? copy(a:message) : split(a:message, "\n", 1)
 letlines[0] =strftime('[%Y-%m-%d %H:%M:%S] ') . get(s:level_prefixes, a:level, '[UNKNOWN] ') . get(lines, 0, '')
 try
@@ -53,11 +50,10 @@ function! copilot#logger#Raw(level, message) abort
 endtry
 endfunction
 
-function!copilot#logger#Trace(...) abort
-callcopilot#logger#Raw(5, a:000)
-endfunction
-
 function!copilot#logger#Debug(...) abort
+if$COPILOT_AGENT_VERBOSE!~#'^\%(1\|true\)$'
+return
+endif
 callcopilot#logger#Raw(4, a:000)
 endfunction
 

autoload/copilot/util.vim

@@ -0,0 +1,15 @@
+lets:deferred= []
+
+function!copilot#util#Defer(fn, ...) abort
+calladd(s:deferred, function(a:fn, a:000))
+returntimer_start(0, function('s:RunDeferred'))
+endfunction
+
+function!s:RunDeferred(...) abort
+ifempty(s:deferred)
+return
+endif
+let Fn =remove(s:deferred, 0)
+calltimer_start(0, function('s:RunDeferred'))
+callcall(Fn, [])
+endfunction

autoload/copilot/version.vim

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

lua/_copilot.lua

@@ -22,12 +22,16 @@ copilot.lsp_start_client = function(cmd, handler_names, opts, settings)
 end
 end
 end
+localworkspace_folders=opts.workspaceFolders
+if#workspace_folders==0then
+workspace_folders=nil
+end
 id=vim.lsp.start_client({
 cmd=cmd,
 cmd_cwd=vim.call('copilot#job#Cwd'),
 name='copilot',
 init_options=opts.initializationOptions,
-workspace_folders=opts.workspace_folders,
+workspace_folders=workspace_folders,
 settings=settings,
 handlers=handlers,
 get_language_id=function(bufnr, filetype)