Skip to content

Update copilot to 1.38 #308

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

Closed
qRoC wants to merge 3 commits into from
Closed

Update copilot to 1.38 #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32f79db
feat: update copilot to 1.38
qRoC Aug 8, 2024
dad4806
fix: rename agent.js to language-server.js
qRoC Aug 8, 2024
1f3271a
fix: enable nvim v0.10 features in v0.11+ versions
qRoC Aug 8, 2024
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
779 changes: 0 additions & 779 deletions copilot/dist/agent.js
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions copilot/dist/agent.js.map
View file
Open in desktop

This file was deleted.

812 changes: 383 additions & 429 deletions copilot/dist/language-server.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions copilot/dist/language-server.js.map
View file
Open in desktop

Large diffs are not rendered by default.

100,260 changes: 0 additions & 100,260 deletions copilot/dist/resources/cl100k/tokenizer_cushman002.json
View file
Open in desktop

This file was deleted.

100,001 changes: 0 additions & 100,001 deletions copilot/dist/resources/cl100k/vocab_cushman002.bpe
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion copilot/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

global.__rootDirectory = __dirname + '/dist/';

require('./dist/agent.js')
require('./dist/language-server.js')
6 changes: 3 additions & 3 deletions lua/copilot/command.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ local function node_version_warning(node_version)
local line = "Warning: Node.js 16 is approaching end of life and support will be dropped in a future release."
if config.get("copilot_node_command") ~= "node" then
line = line
.. " 'copilot_node_command' is set to a non-default value. Consider removing it from your configuration."
.. " 'copilot_node_command' is set to a non-default value. Consider removing it from your configuration."
end
return { line, "MoreMsg" }
end
Expand All @@ -31,9 +31,9 @@ function mod.version()
coroutine.wrap(function()
if client then
local _, data = a.get_version(client)
lines[#lines + 1] = "copilot/dist/agent.js" .. " " .. data.version
lines[#lines + 1] = "copilot/dist/language-server.js" .. " " .. data.version
else
lines[#lines + 1] = "copilot/dist/agent.js" .. " " .. "not running"
lines[#lines + 1] = "copilot/dist/language-server.js" .. " " .. "not running"
end

local node_version, node_version_error = c.get_node_version()
Expand Down
14 changes: 7 additions & 7 deletions lua/copilot/suggestion.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ local hl_group = require("copilot.highlight").group
local util = require("copilot.util")

local _, has_nvim_0_10_x = pcall(function()
return vim.version().minor == 10
return vim.version().minor >= 10
end)

local mod = {}
Expand Down Expand Up @@ -196,11 +196,11 @@ local function get_current_suggestion(ctx)

local ok, choice = pcall(function()
if
not vim.fn.mode():match("^[iR]")
or (copilot.hide_during_completion and vim.fn.pumvisible() == 1)
or vim.b.copilot_suggestion_hidden
or not ctx.suggestions
or #ctx.suggestions == 0
not vim.fn.mode():match("^[iR]")
or (copilot.hide_during_completion and vim.fn.pumvisible() == 1)
or vim.b.copilot_suggestion_hidden
or not ctx.suggestions
or #ctx.suggestions == 0
then
return nil
end
Expand Down Expand Up @@ -250,7 +250,7 @@ local function update_preview(ctx)
local cursor_col = vim.fn.col(".")

displayLines[1] =
string.sub(string.sub(suggestion.text, 1, (string.find(suggestion.text, "\n", 1, true) or 0) - 1), cursor_col)
string.sub(string.sub(suggestion.text, 1, (string.find(suggestion.text, "\n", 1, true) or 0) - 1), cursor_col)

local extmark = {
id = copilot.extmark_id,
Expand Down