Skip to content

Commit 38c6358

Browse files
committed
formatting and org
1 parent d8e75ff commit 38c6358

File tree

7 files changed

+57
-40
lines changed

7 files changed

+57
-40
lines changed

SettingsOpts.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# The following are config variables and their options for the copilot LSP which are set in the "settings" field of the client's startup
2+
- Enable: "enable",
3+
- InlineSuggestEnable: "inlineSuggest.enable",
4+
- ShowEditorCompletions: ["editor", "showEditorCompletions"],
5+
- EnableAutoCompletions: ["editor", "enableAutoCompletions"],
6+
- DelayCompletions: ["editor", "delayCompletions"],
7+
- FilterCompletions: ["editor", "filterCompletions"],
8+
- DisplayStyle: ["advanced", "displayStyle"],
9+
- SecretKey: ["advanced", "secret_key"],
10+
- SolutionLength: ["advanced", "length"],
11+
- Stops: ["advanced", "stops"],
12+
- Temperature: ["advanced", "temperature"],
13+
- TopP: ["advanced", "top_p"],
14+
- IndentationMode: ["advanced", "indentationMode"],
15+
- InlineSuggestCount: ["advanced", "inlineSuggestCount"],
16+
- ListCount: ["advanced", "listCount"],
17+
- DebugOverrideProxyUrl: ["advanced", "debug.overrideProxyUrl"],
18+
- DebugTestOverrideProxyUrl: ["advanced", "debug.testOverrideProxyUrl"],
19+
- DebugEnableGitHubTelemetry: ["advanced", "debug.githubCTSIntegrationEnabled"],
20+
- DebugOverrideEngine: ["advanced", "debug.overrideEngine"],
21+
- DebugShowScores: ["advanced", "debug.showScores"],
22+
- DebugOverrideLogLevels: ["advanced", "debug.overrideLogLevels"],
23+
- DebugFilterLogCategories: ["advanced", "debug.filterLogCategories"],
24+
- DebugUseSuffix: ["advanced", "debug.useSuffix"],
25+
- DebugAcceptSelfSignedCertificate: ["advanced", "debug.acceptSelfSignedCertificate"]

lua/copilot/SettingsOpts.md

Lines changed: 0 additions & 24 deletions
This file was deleted.

lua/copilot/client.lua

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,11 @@ M.merge_server_opts = function (params)
3131
on_init = function(_, _)
3232
vim.schedule(M.buf_attach_copilot)
3333
vim.schedule(register_autocmd)
34+
vim.schedule(function ()
35+
params.extensions[params.cmp.method](params.cmp.max_results)
36+
end)
3437
end,
35-
settings = {
36-
advanced = {
37-
listCount = 10, -- #completions for panel
38-
inlineSuggestCount = 3, -- #completions for getCompletions
39-
}
40-
},
38+
settings = params.settings,
4139
}, params.server_opts_overrides or {})
4240
end
4341

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
local util = require("copilot.util")
22
local format = require("copilot_cmp.format")
33
local handler = require("copilot.handlers")
4-
local print_buf = require("copilot.print_panel")
4+
local print_buf = require("copilot.extensions.print_panel")
55

66
local panel = {
77
method = "getPanelCompletions",
@@ -53,8 +53,8 @@ panel.complete = vim.schedule_wrap(function (_, params, callback)
5353
callback({ isIncomplete = true })
5454
end)
5555

56-
function panel.create (opts)
57-
panel = vim.tbl_deep_extend("force", panel, opts or {})
56+
function panel.create (max_results)
57+
panel.max_results = max_results or 10
5858
panel.buf = type(panel.uri) == "number" or vim.api.nvim_create_buf(false, true)
5959
vim.api.nvim_buf_set_name(panel.buf, "copilot:///" .. tostring(panel.buf))
6060
panel.uri = vim.uri_from_bufnr(panel.buf)
@@ -90,6 +90,7 @@ function panel.create (opts)
9090
once = true,
9191
})
9292
end, {})
93+
9394
return panel
9495
end
9596

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ print_buf.set_text = function (full_text)
1313
vim.api.nvim_buf_set_var(print_buf.bufnr, "modifiable", 1)
1414
vim.api.nvim_buf_set_var(print_buf.bufnr, "readonly", 0)
1515
vim.api.nvim_buf_set_lines(print_buf.bufnr, 0, #full_text, false,full_text)
16+
17+
vim.schedule(function()
18+
vim.api.nvim_buf_set_var(print_buf.bufnr, "modifiable", 0)
19+
vim.api.nvim_buf_set_var(print_buf.bufnr, "readonly", 1)
20+
end)
1621
end
1722

1823
local create_win = function ()

lua/copilot/init.lua

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,28 @@ local M = { client_info = nil }
22
local client = require("copilot.client")
33

44
local defaults = {
5-
cmp_method = "getCompletionsCycling",
5+
cmp = {
6+
method = "getPanelCompletions",
7+
max_results = 5,
8+
},
9+
extensions = {
10+
getPanelCompletions = function (max_results)
11+
local panel = require("copilot.extensions.panel").create(max_results)
12+
require("copilot_cmp").setup(panel.complete)
13+
end,
14+
getCompletionsCycling = function ()
15+
require("copilot_cmp").setup()
16+
end,
17+
},
618
ft_disable = {},
719
plugin_manager_path = vim.fn.stdpath("data") .. "/site/pack/packer",
820
server_opts_overrides = {},
21+
settings = {
22+
advanced = {
23+
listCount = 10, -- #completions for panel
24+
inlineSuggestCount = 3, -- #completions for getCompletions
25+
}
26+
}
927
}
1028

1129
local config_handler = function(opts)
@@ -16,12 +34,6 @@ end
1634
M.setup = function(opts)
1735
local user_config = config_handler(opts)
1836
vim.schedule(function () client.start(user_config) end)
19-
if user_config.cmp_method == "getPanelCompletions" then
20-
local panel = require("copilot.panel").create()
21-
require("copilot_cmp").setup(panel.complete)
22-
elseif user_config.cmp_method == "getCompletionsCycling" then
23-
require("copilot_cmp").setup()
24-
end
2537
end
2638

2739
return M

0 commit comments

Comments
 (0)