Copilot.vim 1.33.0

Author: tpope

autoload/copilot.vim

@@ -35,48 +35,48 @@ function! s:EditorConfiguration() abort
 endfunction
 
 function!copilot#Init(...) abort
-callcopilot#util#Defer({-> exists('s:agent') ||s:Start() })
+callcopilot#util#Defer({-> exists('s:client') ||s:Start() })
 endfunction
 
 function!s:Running() abort
-returnexists('s:agent.job') ||exists('s:agent.client_id')
+returnexists('s:client.job') ||exists('s:client.client_id')
 endfunction
 
 function!s:Start() abort
 ifs:Running()
 return
 endif
-lets:agent=copilot#agent#New({'editorConfiguration' : s:EditorConfiguration()})
+lets:client=copilot#client#New({'editorConfiguration' : s:EditorConfiguration()})
 endfunction
 
 function!s:Stop() abort
-ifexists('s:agent')
-letagent=remove(s:, 'agent')
-callagent.Close()
+ifexists('s:client')
+letclient=remove(s:, 'client')
+callclient.Close()
 endif
 endfunction
 
-function!copilot#Agent() abort
+function!copilot#Client() abort
 calls:Start()
-returns:agent
+returns:client
 endfunction
 
-function!copilot#RunningAgent() abort
+function!copilot#RunningClient() abort
 ifs:Running()
-returns:agent
+returns:client
 else
 returnv:null
 endif
 endfunction
 
 function!s:NodeVersionWarning() abort
-ifexists('s:agent.node_version') &&s:agent.node_version =~# '^1[67]\.'
+ifexists('s:client.node_version') &&s:client.node_version =~# '^1[67]\.'
 echohlWarningMsg
-echo"Warning: Node.js"matchstr(s:agent.node_version, '^\d\+') "is end-of-life and support will be dropped in a future release of copilot.vim."
+echo"Warning: Node.js"matchstr(s:client.node_version, '^\d\+') "is end-of-life and support will be dropped in a future release of copilot.vim."
 echohlNONE
-elseifexists('s:agent.node_version_warning')
+elseifexists('s:client.node_version_warning')
 echohlWarningMsg
-echo'Warning:'s:agent.node_version_warning
+echo'Warning:'s:client.node_version_warning
 echohlNONE
 endif
 endfunction
@@ -96,18 +96,18 @@ function! s:EditorVersionWarning() abort
 endfunction
 
 function!copilot#Request(method, params, ...) abort
-letagent=copilot#Agent()
-returncall(agent.Request, [a:method, a:params] +a:000)
+letclient=copilot#Client()
+returncall(client.Request, [a:method, a:params] +a:000)
 endfunction
 
 function!copilot#Call(method, params, ...) abort
-letagent=copilot#Agent()
-returncall(agent.Call, [a:method, a:params] +a:000)
+letclient=copilot#Client()
+returncall(client.Call, [a:method, a:params] +a:000)
 endfunction
 
 function!copilot#Notify(method, params, ...) abort
-letagent=copilot#Agent()
-returncall(agent.Notify, [a:method, a:params] +a:000)
+letclient=copilot#Client()
+returncall(client.Notify, [a:method, a:params] +a:000)
 endfunction
 
 function!copilot#NvimNs() abort
@@ -119,8 +119,8 @@ function! copilot#Clear() abort
 calltimer_stop(remove(g:, '_copilot_timer'))
 endif
 ifexists('b:_copilot')
-callcopilot#agent#Cancel(get(b:_copilot, 'first',{}))
-callcopilot#agent#Cancel(get(b:_copilot, 'cycling',{}))
+callcopilot#client#Cancel(get(b:_copilot, 'first',{}))
+callcopilot#client#Cancel(get(b:_copilot, 'cycling',{}))
 endif
 calls:UpdatePreview()
 unlet!b:_copilot
@@ -182,10 +182,10 @@ function! copilot#Complete(...) abort
 let target = [bufnr(''), getbufvar('', 'changedtick'), line('.'), col('.')]
 if!exists('b:_copilot.target') ||b:_copilot.target !=# target
 ifexists('b:_copilot.first')
-callcopilot#agent#Cancel(b:_copilot.first)
+callcopilot#client#Cancel(b:_copilot.first)
 endif
 ifexists('b:_copilot.cycling')
-callcopilot#agent#Cancel(b:_copilot.cycling)
+callcopilot#client#Cancel(b:_copilot.cycling)
 endif
 let params ={
 \ 'textDocument':{'uri': bufnr('')},
@@ -202,9 +202,9 @@ function! copilot#Complete(...) abort
 if!a:0
 return completion.Await()
 else
-callcopilot#agent#Result(completion, a:1)
+callcopilot#client#Result(completion, a:1)
 ifa:0 > 1
-callcopilot#agent#Error(completion, a:2)
+callcopilot#client#Error(completion, a:2)
 endif
 endif
 endfunction
@@ -414,7 +414,7 @@ endfunction
 
 function!s:Attach(bufnr, ...) abort
 try
-returncopilot#Agent().Attach(a:bufnr)
+returncopilot#Client().Attach(a:bufnr)
 catch
 callcopilot#logger#Exception()
 endtry
@@ -427,8 +427,8 @@ function! copilot#OnFileType() abort
 endfunction
 
 function!s:Focus(bufnr, ...) abort
-ifs:Running() &&copilot#Agent().IsAttached(a:bufnr)
-callcopilot#Agent().Notify('textDocument/didFocus',{'textDocument':{'uri': copilot#Agent().Attach(a:bufnr).uri}})
+ifs:Running() &&copilot#Client().IsAttached(a:bufnr)
+callcopilot#Client().Notify('textDocument/didFocus',{'textDocument':{'uri': copilot#Client().Attach(a:bufnr).uri}})
 endif
 endfunction
 
@@ -577,7 +577,7 @@ function! s:EnabledStatusMessage() abort
 endfunction
 
 function!s:VerifySetup() abort
-leterror=copilot#Agent().StartupError()
+leterror=copilot#Client().StartupError()
 if!empty(error)
 echo'Copilot: ' . error
 return
@@ -608,10 +608,10 @@ function! s:commands.status(opts) abort
 return
 endif
 
-ifexists('s:agent.status.status') &&s:agent.status.status =~# 'Warning\|Error'
-echo'Copilot: ' . s:agent.status.status
-if!empty(get(s:agent.status, 'message', ''))
-echon': ' . s:agent.status.message
+ifexists('s:client.status.status') &&s:client.status.status =~# 'Warning\|Error'
+echo'Copilot: ' . s:client.status.status
+if!empty(get(s:client.status, 'message', ''))
+echon': ' . s:client.status.message
 endif
 return
 endif
@@ -638,7 +638,7 @@ function! s:commands.signout(opts) abort
 endfunction
 
 function!s:commands.setup(opts) abort
-let startup_error =copilot#Agent().StartupError()
+let startup_error =copilot#Client().StartupError()
 if!empty(startup_error)
 echo'Copilot: ' . startup_error
 return
@@ -718,25 +718,25 @@ function! s:commands.help(opts) abort
 endfunction
 
 function!s:commands.version(opts) abort
-echo'copilot.vim ' .copilot#agent#EditorPluginInfo().version
-let editorInfo =copilot#agent#EditorInfo()
+echo'copilot.vim ' .copilot#client#EditorPluginInfo().version
+let editorInfo =copilot#client#EditorInfo()
 echo editorInfo.name . '' . editorInfo.version
 ifs:Running()
-let versions =s:agent.Request('getVersion',{})
-ifexists('s:agent.serverInfo.version')
-echos:agent.serverInfo.name . '' . s:agent.serverInfo.version
+let versions =s:client.Request('getVersion',{})
+ifexists('s:client.serverInfo.version')
+echos:client.serverInfo.name . '' . s:client.serverInfo.version
 else
 echo'GitHub Copilot Language Server ' . versions.Await().version
 endif
-ifexists('s:agent.node_version')
-echo'Node.js ' . s:agent.node_version
+ifexists('s:client.node_version')
+echo'Node.js ' . s:client.node_version
 else
 echo'Node.js ' . substitute(get(versions.Await(), 'runtimeVersion', '?'), '^node/', '', 'g')
 endif
 else
 echo'Not running'
-ifexists('s:agent.node_version')
-echo'Node.js ' . s:agent.node_version
+ifexists('s:client.node_version')
+echo'Node.js ' . s:client.node_version
 endif
 endif
 ifhas('win32')
@@ -775,7 +775,7 @@ endfunction
 
 function!s:commands.restart(opts) abort
 calls:Stop()
-let err =copilot#Agent().StartupError()
+let err =copilot#Client().StartupError()
 if!empty(err)
 return'echoerr ' . string('Copilot: ' . err)
 endif
@@ -818,7 +818,7 @@ function! copilot#Command(line1, line2, range, bang, mods, arg) abort
 return'echoerr ' . string('Copilot: unknown command ' . string(cmd))
 endif
 try
-let err =copilot#Agent().StartupError()
+let err =copilot#Client().StartupError()
 if!empty(err)
 return'echo ' . string('Copilot: ' . err)
 endif

autoload/copilot/agent.vim autoload/copilot/client.vimautoload/copilot/agent.vim renamed to autoload/copilot/client.vim

@@ -377,22 +377,22 @@ function! s:OnExit(instance, code, ...) abort
 endif
 endfunction
 
-function!copilot#agent#LspInit(id, initialize_result) abort
+function!copilot#client#LspInit(id, initialize_result) abort
 if!has_key(s:instances, a:id)
 return
 endif
 calls:AfterInitialize(a:initialize_result, s:instances[a:id])
 endfunction
 
-function!copilot#agent#LspExit(id, code, signal) abort
+function!copilot#client#LspExit(id, code, signal) abort
 if!has_key(s:instances, a:id)
 return
 endif
 let instance =remove(s:instances, a:id)
 calls:OnExit(instance, a:code)
 endfunction
 
-function!copilot#agent#LspResponse(id, opts, ...) abort
+function!copilot#client#LspResponse(id, opts, ...) abort
 if!has_key(s:instances, a:id)
 return
 endif
@@ -419,7 +419,7 @@ function! s:NvimRequest(method, params, ...) dict abort
 returncall('s:SetUpRequest', [self, id, a:method, params, progress] +a:000)
 endif
 ifhas_key(self, 'client_id')
-callcopilot#agent#LspExit(self.client_id, -1, -1)
+callcopilot#client#LspExit(self.client_id, -1, -1)
 endif
 throw'Copilot: LSP client not available'
 endfunction
@@ -435,7 +435,7 @@ function! s:NvimNotify(method, params) dict abort
 returneval("v:lua.require'_copilot'.rpc_notify(self.id, a:method, a:params)")
 endfunction
 
-function!copilot#agent#LspHandle(id, request) abort
+function!copilot#client#LspHandle(id, request) abort
 if!has_key(s:instances, a:id)
 return
 endif
@@ -512,7 +512,7 @@ function! s:UrlDecode(str) abort
 returnsubstitute(a:str, '%\(\x\x\)', '\=iconv(nr2char("0x".submatch(1)), "utf-8", "latin1")', 'g')
 endfunction
 
-function!copilot#agent#EditorInfo() abort
+function!copilot#client#EditorInfo() abort
 if!exists('s:editor_version')
 ifhas('nvim')
 lets:editor_version=matchstr(execute('version'), 'NVIM v\zs[^[:space:]]\+')
@@ -523,11 +523,11 @@ function! copilot#agent#EditorInfo() abort
 return{'name': has('nvim') ? 'Neovim': 'Vim', 'version': s:editor_version}
 endfunction
 
-function!copilot#agent#EditorPluginInfo() abort
+function!copilot#client#EditorPluginInfo() abort
 return{'name': 'copilot.vim', 'version': s:plugin_version}
 endfunction
 
-function!copilot#agent#Settings() abort
+function!copilot#client#Settings() abort
 let settings ={
 \ 'http':{
 \ 'proxy': get(g:, 'copilot_proxy', v:null),
@@ -609,7 +609,7 @@ let s:vim_capabilities ={
 \ 'window':{'showDocument':{'support': v:true}},
 \ }
 
-function!copilot#agent#New(...) abort
+function!copilot#client#New(...) abort
 let opts =a:0 ? a:1 :{}
 let instance ={'requests':{},
 \ 'progress':{},
@@ -644,11 +644,11 @@ function! copilot#agent#New(...) abort
 endif
 let opts ={}
 let opts.initializationOptions ={
-\ 'editorInfo': copilot#agent#EditorInfo(),
-\ 'editorPluginInfo': copilot#agent#EditorPluginInfo(),
+\ 'editorInfo': copilot#client#EditorInfo(),
+\ 'editorPluginInfo': copilot#client#EditorPluginInfo(),
 \ }
 let opts.workspaceFolders = []
-let settings =extend(copilot#agent#Settings(), get(opts, 'editorConfiguration',{}))
+let settings =extend(copilot#client#Settings(), get(opts, 'editorConfiguration',{}))
 iftype(get(g:, 'copilot_workspace_folders')) ==v:t_list
 for folder ing:copilot_workspace_folders
 iftype(folder) ==v:t_string&&!empty(folder) && folder !~#'\*\*\|^/$'
@@ -699,7 +699,7 @@ function! copilot#agent#New(...) abort
 return instance
 endfunction
 
-function!copilot#agent#Cancel(request) abort
+function!copilot#client#Cancel(request) abort
 iftype(a:request) ==type({}) &&has_key(a:request, 'Cancel')
 calla:request.Cancel()
 endif
@@ -712,15 +712,15 @@ function! s:Callback(request, type, callback, timer) abort
 endif
 endfunction
 
-function!copilot#agent#Result(request, callback) abort
+function!copilot#client#Result(request, callback) abort
 ifhas_key(a:request, 'resolve')
 calladd(a:request.resolve, a:callback)
 elseifhas_key(a:request, 'result')
 leta:request.waiting[timer_start(0, function('s:Callback', [a:request, 'result', a:callback]))] =1
 endif
 endfunction
 
-function!copilot#agent#Error(request, callback) abort
+function!copilot#client#Error(request, callback) abort
 ifhas_key(a:request, 'reject')
 calladd(a:request.reject, a:callback)
 elseifhas_key(a:request, 'error')

autoload/copilot/logger.vim

@@ -76,8 +76,8 @@ endfunction
 function!copilot#logger#Exception(...) abort
 if!empty(v:exception) &&v:exception!=#'Vim:Interrupt'
 callcopilot#logger#Error('Exception: ' . v:exception . ' @ ' . v:throwpoint)
-letagent=copilot#RunningAgent()
-if!empty(agent)
+letclient=copilot#RunningClient()
+if!empty(client)
 let [_, type, code, message; __] =matchlist(v:exception, '^\%(\(^[[:alnum:]_#]\+\)\%((\a\+)\)\=\%(\(:E-\=\d\+\)\)\=:\s*\)\=\(.*\)$')
 let stacklines = []
 for frame insplit(substitute(v:throwpoint, ', \S\+ \(\d\+\)$', '[\1]', ''), '\.\@<!\.\.\.\@!')
@@ -92,7 +92,7 @@ function! copilot#logger#Exception(...) abort
 calladd(stacklines,{'function': '[redacted]'})
 endif
 endfor
-returnagent.Request('telemetry/exception',{
+returnclient.Request('telemetry/exception',{
 \ 'transaction': a:0 ? a:1 : '',
 \ 'platform': 'other',
 \ 'exception_detail': [{

autoload/copilot/version.vim

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