Skip to content

Commit 57a0115

Browse files
tpopetpope
committed
Copilot.vim 1.24.0
1 parent 0754163 commit 57a0115

File tree

6 files changed

+180
-147
lines changed

6 files changed

+180
-147
lines changed

‎autoload/copilot.vim‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -432,20 +432,31 @@ function! copilot#Schedule(...) abort
432432
let g:_copilot_timer = timer_start(delay, function('s:Trigger', [bufnr('')]))
433433
endfunction
434434

435-
function! s:SyncTextDocument(bufnr, ...) abort
435+
function! s:Attach(bufnr, ...) abort
436436
try
437-
return copilot#Agent().SyncTextDocument(a:bufnr)
437+
return copilot#Agent().Attach(a:bufnr)
438438
catch
439439
call copilot#logger#Exception()
440440
endtry
441441
endfunction
442442

443443
function! copilot#OnFileType() abort
444-
if empty(s:BufferDisabled())
445-
call timer_start(0, function('s:SyncTextDocument', [bufnr('')]))
444+
if empty(s:BufferDisabled()) && &l:modifiable && &l:buflisted
445+
call timer_start(0, function('s:Attach', [bufnr('')]))
446446
endif
447447
endfunction
448448

449+
function! s:Focus(bufnr, ...) abort
450+
if s:Running() && copilot#Agent().IsAttached(a:bufnr)
451+
call copilot#Agent().Notify('textDocument/didFocus', {'textDocument': {'uri': copilot#Agent().Attach(a:bufnr).uri}})
452+
endif
453+
endfunction
454+
455+
function! copilot#OnBufEnter() abort
456+
let bufnr = bufnr('')
457+
call timer_start(0, { _ -> timer_start(0, function('s:Focus', [bufnr]))})
458+
endfunction
459+
449460
function! copilot#OnInsertLeave() abort
450461
return copilot#Clear()
451462
endfunction

‎autoload/copilot/agent.vim‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,14 +188,14 @@ function! s:PreprocessParams(agent, params) abort
188188
for doc in filter([get(a:params, 'doc', {}), get(a:params, 'textDocument', {})], 'type(get(v:val, "uri", "")) == v:t_number')
189189
let bufnr = doc.uri
190190
call s:RegisterWorkspaceFolderForBuffer(a:agent, bufnr)
191-
let synced = a:agent.SyncTextDocument(bufnr)
191+
let synced = a:agent.Attach(bufnr)
192192
let doc.uri = synced.uri
193-
let doc.version = synced.version
193+
let doc.version = get(synced, 'version', 0)
194194
endfor
195195
return bufnr
196196
endfunction
197197

198-
function! s:VimSyncTextDocument(bufnr) dict abort
198+
function! s:VimAttach(bufnr) dict abort
199199
if !bufloaded(a:bufnr)
200200
return {'uri': '', 'version': 0}
201201
endif
@@ -223,6 +223,10 @@ function! s:VimSyncTextDocument(bufnr) dict abort
223223
return doc
224224
endfunction
225225

226+
function! s:VimIsAttached(bufnr) dict abort
227+
return bufloaded(a:bufnr) && has_key(self.open_buffers, a:bufnr) ? v:true : v:false
228+
endfunction
229+
226230
function! s:AgentRequest(method, params, ...) dict abort
227231
let s:id += 1
228232
let params = deepcopy(a:params)
@@ -365,14 +369,18 @@ function! copilot#agent#LspResponse(agent_id, opts, ...) abort
365369
call s:OnResponse(s:instances[a:agent_id], a:opts)
366370
endfunction
367371

368-
function! s:NvimSyncTextDocument(bufnr) dict abort
372+
function! s:NvimAttach(bufnr) dict abort
369373
if !bufloaded(a:bufnr)
370374
return {'uri': '', 'version': 0}
371375
endif
372376
call luaeval('pcall(vim.lsp.buf_attach_client, _A[1], _A[2])', [a:bufnr, self.id])
373377
return luaeval('{uri = vim.uri_from_bufnr(_A), version = vim.lsp.util.buf_versions[_A]}', a:bufnr)
374378
endfunction
375379

380+
function! s:NvimIsAttached(bufnr) dict abort
381+
return bufloaded(a:bufnr) ? luaeval('vim.lsp.buf_is_attached(_A[1], _A[2])', [a:bufnr, self.id]) : v:false
382+
endfunction
383+
376384
function! s:LspRequest(method, params, ...) dict abort
377385
let params = deepcopy(a:params)
378386
let bufnr = s:PreprocessParams(self, params)
@@ -575,7 +583,8 @@ function! copilot#agent#New(...) abort
575583
\ 'Close': function('s:AgentClose'),
576584
\ 'Notify': function('s:AgentNotify'),
577585
\ 'Request': function('s:AgentRequest'),
578-
\ 'SyncTextDocument': function('s:VimSyncTextDocument'),
586+
\ 'Attach': function('s:VimAttach'),
587+
\ 'IsAttached': function('s:VimIsAttached'),
579588
\ 'Call': function('s:AgentCall'),
580589
\ 'Cancel': function('s:AgentCancel'),
581590
\ 'StartupError': function('s:AgentStartupError'),
@@ -622,7 +631,8 @@ function! copilot#agent#New(...) abort
622631
\ 'Close': function('s:LspClose'),
623632
\ 'Notify': function('s:LspNotify'),
624633
\ 'Request': function('s:LspRequest'),
625-
\ 'SyncTextDocument': function('s:NvimSyncTextDocument'),
634+
\ 'Attach': function('s:NvimAttach'),
635+
\ 'IsAttached': function('s:NvimIsAttached'),
626636
\ })
627637
let instance.client_id = eval("v:lua.require'_copilot'.lsp_start_client(command, keys(instance.methods), opts, instance.settings)")
628638
let instance.id = instance.client_id

‎autoload/copilot/version.vim‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
function! copilot#version#String() abort
2-
return '1.23.0'
2+
return '1.24.0'
33
endfunction

‎dist/agent.js‎

Lines changed: 144 additions & 133 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/agent.js.map‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎plugin/copilot.vim‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ augroup github_copilot
5757
autocmd BufLeave * if mode() =~# '^[iR]'|call s:Event('InsertLeave')|endif
5858
autocmd InsertEnter * call s:Event('InsertEnter')
5959
autocmd BufEnter * if mode() =~# '^[iR]'|call s:Event('InsertEnter')|endif
60+
autocmd BufEnter * call s:Event('BufEnter')
6061
autocmd CursorMovedI * call s:Event('CursorMovedI')
6162
autocmd CompleteChanged * call s:Event('CompleteChanged')
6263
autocmd ColorScheme,VimEnter * call s:ColorScheme()

0 commit comments

Comments
 (0)