Skip to content

Commit 037f594

Browse files
tpopetpope
committed
Copilot.vim 1.25.0
1 parent 57a0115 commit 037f594

File tree

7 files changed

+216
-195
lines changed

7 files changed

+216
-195
lines changed

‎autoload/copilot.vim‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,11 @@ function! copilot#Accept(...) abort
503503
if empty(text)
504504
let text = s.text
505505
endif
506-
call copilot#Request('notifyAccepted', {'uuid': s.uuid, 'acceptedLength': copilot#doc#UTF16Width(text)})
506+
let acceptance = {'uuid': s.uuid}
507+
if text !=# s.text
508+
let acceptance.acceptedLength = copilot#doc#UTF16Width(text)
509+
endif
510+
call copilot#Request('notifyAccepted', acceptance)
507511
call s:ClearPreview()
508512
let s:suggestion_text = text
509513
return repeat("\<Left>\<Del>", s.outdentSize) . repeat("\<Del>", s.deleteSize) .

‎autoload/copilot/agent.vim‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,12 @@ function! s:Send(agent, request) abort
7272
endfunction
7373

7474
function! s:AgentNotify(method, params) dict abort
75-
return s:Send(self, {'method': a:method, 'params': a:params})
75+
let request = {'method': a:method, 'params': a:params}
76+
if has_key(self, 'initialization_pending')
77+
call add(self.initialization_pending, request)
78+
else
79+
return s:Send(self, request)
80+
endif
7681
endfunction
7782

7883
function! s:RequestWait() dict abort
@@ -164,8 +169,8 @@ function! s:BufferText(bufnr) abort
164169
return join(getbufline(a:bufnr, 1, '$'), "\n") . "\n"
165170
endfunction
166171

167-
function! s:SendRequest(agent, request) abort
168-
if empty(s:Send(a:agent, a:request)) && has_key(a:agent.requests, a:request.id)
172+
function! s:SendRequest(agent, request, ...) abort
173+
if empty(s:Send(a:agent, a:request)) && has_key(a:request, 'id') && has_key(a:agent.requests, a:request.id)
169174
call s:RejectRequest(remove(a:agent.requests, a:request.id), {'code': 257, 'message': 'Write failed'})
170175
endif
171176
endfunction
@@ -524,15 +529,10 @@ function! s:AfterInitialize(result, agent) abort
524529
endfunction
525530

526531
function! s:InitializeResult(result, agent) abort
527-
let pending = get(a:agent, 'initialization_pending', [])
528-
if has_key(a:agent, 'initialization_pending')
529-
call remove(a:agent, 'initialization_pending')
530-
endif
531-
call a:agent.Notify('initialized', {})
532532
call s:AfterInitialize(a:result, a:agent)
533-
call a:agent.Notify('workspace/didChangeConfiguration', {'settings': a:agent.settings})
534-
for request in pending
535-
call timer_start(0, { _ -> s:SendRequest(a:agent, request) })
533+
call s:Send(a:agent, {'method': 'initialized', 'params': {}})
534+
for request in remove(a:agent, 'initialization_pending')
535+
call timer_start(0, function('s:SendRequest', [a:agent, request]))
536536
endfor
537537
endfunction
538538

@@ -578,7 +578,6 @@ let s:vim_capabilities = {
578578
function! copilot#agent#New(...) abort
579579
let opts = a:0 ? a:1 : {}
580580
let instance = {'requests': {},
581-
\ 'settings': extend(copilot#agent#Settings(), get(opts, 'editorConfiguration', {})),
582581
\ 'workspaceFolders': {},
583582
\ 'Close': function('s:AgentClose'),
584583
\ 'Notify': function('s:AgentNotify'),
@@ -611,6 +610,7 @@ function! copilot#agent#New(...) abort
611610
\ 'editorPluginInfo': copilot#agent#EditorPluginInfo(),
612611
\ }
613612
let opts.workspaceFolders = []
613+
let settings = extend(copilot#agent#Settings(), get(opts, 'editorConfiguration', {}))
614614
if type(get(g:, 'copilot_workspace_folders')) == v:t_list
615615
for folder in g:copilot_workspace_folders
616616
if type(folder) == v:t_string && !empty(folder) && folder !~# '\*\*\|^/$'
@@ -634,7 +634,7 @@ function! copilot#agent#New(...) abort
634634
\ 'Attach': function('s:NvimAttach'),
635635
\ 'IsAttached': function('s:NvimIsAttached'),
636636
\ })
637-
let instance.client_id = eval("v:lua.require'_copilot'.lsp_start_client(command, keys(instance.methods), opts, instance.settings)")
637+
let instance.client_id = eval("v:lua.require'_copilot'.lsp_start_client(command, keys(instance.methods), opts, settings)")
638638
let instance.id = instance.client_id
639639
else
640640
let state = {'headers': {}, 'mode': 'headers', 'buffer': ''}
@@ -655,6 +655,7 @@ function! copilot#agent#New(...) abort
655655
let opts.processId = getpid()
656656
let request = instance.Request('initialize', opts, function('s:InitializeResult'), function('s:InitializeError'), instance)
657657
let instance.initialization_pending = []
658+
call instance.Notify('workspace/didChangeConfiguration', {'settings': settings})
658659
endif
659660
let s:instances[instance.id] = instance
660661
return instance

‎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.24.0'
2+
return '1.25.0'
33
endfunction

‎dist/agent.js‎

Lines changed: 173 additions & 171 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.

‎doc/copilot.txt‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,24 @@ Lua version:
176176
SYNTAX HIGHLIGHTING *copilot-highlighting*
177177

178178
Inline suggestions are highlighted using the CopilotSuggestion group,
179-
defaulting to a medium gray. The best place to override this is a file named
180-
after/colors/<colorschemename>.vim in your 'runtimepath' (e.g.,
181-
~/.config/nvim/after/colors/solarized.vim). Example declaration:
179+
defaulting to a medium gray. The best place to override this is with
180+
a |ColorScheme| autocommand:
182181
>
183-
highlight CopilotSuggestion guifg=#555555 ctermfg=8
182+
autocmd ColorScheme solarized
183+
\ highlight CopilotSuggestion guifg=#555555 ctermfg=8
184+
<
185+
Lua version:
186+
>
187+
vim.api.nvim_create_autocmd('ColorScheme', {
188+
pattern = 'solarized',
189+
-- group = ...,
190+
callback = function()
191+
vim.api.nvim_set_hl(0, 'CopilotSuggestion', {
192+
fg = '#555555',
193+
ctermfg = 8,
194+
force = true
195+
})
196+
end
197+
})
184198
<
185199
vim:tw=78:et:ft=help:norl:

‎plugin/copilot.vim‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ function! s:ColorScheme() abort
1515
if &t_Co == 256
1616
hi def CopilotSuggestion guifg=#808080 ctermfg=244
1717
else
18-
hi def CopilotSuggestion guifg=#808080 ctermfg=8
18+
hi def CopilotSuggestion guifg=#808080 ctermfg=12
1919
endif
20-
hi def link CopilotAnnotation Normal
20+
hi def link CopilotAnnotation MoreMsg
2121
endfunction
2222

2323
function! s:MapTab() abort

0 commit comments

Comments
 (0)