Skip to content

[pull] master from zbirenbaum:master #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Apr 3, 2025
Merged

[pull] master from zbirenbaum:master #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6c341a
fix: proxy_uri and provider_url configurations not being passed along
AntoineGS Apr 3, 2025
13ae718
feat: update to latest Copilot LSP (#426)
github-actions[bot] Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
695 changes: 351 additions & 344 deletions copilot/js/main.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions copilot/js/main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions lua/copilot/client.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ local function prepare_client_config(overrides)
}

if proxy_uri then
vim.tbl_extend("force", settings, {
settings = vim.tbl_extend("force", settings, {
http = { ---@type copilot_settings_http
proxy = proxy_uri,
proxyStrictSSL = vim.g.copilot_proxy_strict_ssl or false,
Expand All @@ -269,7 +269,7 @@ local function prepare_client_config(overrides)
end

if provider_url then
vim.tbl_extend("force", settings, {
settings = vim.tbl_extend("force", settings, {
["github-enterprise"] = { ---@type copilot_settings_github-enterprise
uri = provider_url,
},
Expand Down
2 changes: 1 addition & 1 deletion lua/copilot/util.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function M.get_editor_info()
editorPluginInfo = {
name = "copilot.lua",
-- reflects version of github/copilot-language-server-release
version = "1.294.0",
version = "1.295.0",
},
}
return info
Expand Down