Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4d32b06

Browse files
committed
Copilot.vim 1.20.1
1 parent2f32e1a commit4d32b06

File tree

3 files changed

+21
-13
lines changed

3 files changed

+21
-13
lines changed

‎autoload/copilot/agent.vim

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,7 @@ function! copilot#agent#LspInit(agent_id, initialize_result) abort
310310
if!has_key(s:instances,a:agent_id)
311311
return
312312
endif
313-
let instance=s:instances[a:agent_id]
314-
calltimer_start(0, { _->s:InitializeResult(a:initialize_result, instance)})
313+
calls:AfterInitialize(a:initialize_result,s:instances[a:agent_id])
315314
endfunction
316315

317316
function!copilot#agent#LspExit(agent_id, code, signal)abort
@@ -462,20 +461,21 @@ function! copilot#agent#Settings() abort
462461
return settings
463462
endfunction
464463

465-
function!s:InitializeResult(result, agent)abort
464+
function!s:AfterInitialize(result, agent)abort
466465
leta:agent.serverInfo=get(a:result,'serverInfo', {})
467466
if!has_key(a:agent,'node_version')&&has_key(a:result.serverInfo,'nodeVersion')
468467
leta:agent.node_version=a:result.serverInfo.nodeVersion
469468
endif
470-
let info= {
471-
\'editorInfo':copilot#agent#EditorInfo(),
472-
\'editorPluginInfo':copilot#agent#EditorPluginInfo(),
473-
\'editorConfiguration':extend(copilot#agent#Settings(),a:agent.editorConfiguration)}
469+
endfunction
470+
471+
function!s:InitializeResult(result, agent)abort
474472
let pending=get(a:agent,'initialization_pending', [])
475473
ifhas_key(a:agent,'initialization_pending')
476474
callremove(a:agent,'initialization_pending')
477475
endif
478-
calla:agent.Request('setEditorInfo', info)
476+
calla:agent.Notify('initialized', {})
477+
calls:AfterInitialize(a:result,a:agent)
478+
calla:agent.Notify('workspace/didChangeConfiguration', {'settings':a:agent.settings})
479479
for requestin pending
480480
calltimer_start(0, { _->s:SendRequest(a:agent, request) })
481481
endfor
@@ -514,7 +514,7 @@ let s:vim_capabilities = {
514514
function!copilot#agent#New(...)abort
515515
let opts=a:0 ?a:1 : {}
516516
let instance= {'requests': {},
517-
\'editorConfiguration':get(opts,'editorConfiguration', {}),
517+
\'settings':extend(copilot#agent#Settings(),get(opts,'editorConfiguration', {})),
518518
\'Close':function('s:AgentClose'),
519519
\'Notify':function('s:AgentNotify'),
520520
\'Request':function('s:AgentRequest'),
@@ -538,13 +538,17 @@ function! copilot#agent#New(...) abort
538538
if!empty(node_version)
539539
let instance.node_version= node_version
540540
endif
541-
let opts= {'initializationOptions': {}}
541+
let opts= {}
542+
let opts.initializationOptions= {
543+
\'editorInfo':copilot#agent#EditorInfo(),
544+
\'editorPluginInfo':copilot#agent#EditorPluginInfo(),
545+
\}
542546
ifhas('nvim')
543547
callextend(instance, {
544548
\'Close':function('s:LspClose'),
545549
\'Notify':function('s:LspNotify'),
546550
\'Request':function('s:LspRequest')})
547-
let instance.client_id=eval("v:lua.require'_copilot'.lsp_start_client(command, keys(instance.methods), opts)")
551+
let instance.client_id=eval("v:lua.require'_copilot'.lsp_start_client(command, keys(instance.methods), opts, instance.settings)")
548552
let instance.id= instance.client_id
549553
else
550554
letstate= {'headers': {},'mode':'headers','buffer':''}

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

‎lua/_copilot.lua

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ local showDocument = function(err, result, ctx, _)
88
end
99
end
1010

11-
copilot.lsp_start_client=function(cmd,handler_names,opts)
11+
copilot.lsp_start_client=function(cmd,handler_names,opts,settings)
1212
localhandlers= {['window/showDocument']=showDocument}
1313
localid
1414
for_,nameinipairs(handler_names)do
@@ -26,12 +26,16 @@ copilot.lsp_start_client = function(cmd, handler_names, opts)
2626
cmd_cwd=vim.call('copilot#job#Cwd'),
2727
name='copilot',
2828
init_options=opts.initializationOptions,
29+
settings=settings,
2930
handlers=handlers,
3031
get_language_id=function(bufnr,filetype)
3132
returnvim.call('copilot#doc#LanguageForFileType',filetype)
3233
end,
3334
on_init=function(client,initialize_result)
3435
vim.call('copilot#agent#LspInit',client.id,initialize_result)
36+
ifvim.fn.has('nvim-0.8')==0then
37+
client.notify('workspace/didChangeConfiguration', {settings=settings })
38+
end
3539
end,
3640
on_exit=function(code,signal,client_id)
3741
vim.schedule(function()

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp