Skip to content
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.

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

Bring to head of internal repo #96

Merged
merged 1 commit into from
Sep 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
root = true

[*]
indent_style = tab
indent_size = 4
71 changes: 0 additions & 71 deletions .github/workflows/update.yaml

This file was deleted.

5 changes: 2 additions & 3 deletions lua/codeium/io.lua
Original file line number Diff line number Diff line change
Expand Up @@ -456,13 +456,12 @@ end
function M.shell_open(...)
local info = M.get_system_info()
if info.os == "linux" then
return M.get_command_output("xdg-open",...)
return M.get_command_output("xdg-open", ...)
elseif info.os == "macos" then
return M.get_command_output("/usr/bin/open", ...)
else
return M.get_command_output("cmd", "/C start ".. string.gsub(..., "&","^&") )
return M.get_command_output("cmd", "/C start " .. string.gsub(..., "&", "^&"))
end
end


return M
4 changes: 2 additions & 2 deletions lua/codeium/source.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ local function codeium_to_cmp(comp, offset, right)
local documentation = comp.completion.text

local label = string.sub(documentation, offset)
if string.sub(label, -#right) == right then
label = string.sub(label, 1, -#right - 1)
if string.sub(label, - #right) == right then
label = string.sub(label, 1, - #right - 1)
end

-- We get the completion part that has the largest offset
Expand Down
10 changes: 5 additions & 5 deletions lua/codeium/update.lua
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ function M.validate(callback)
else
notify.error(
stamp
.. " does not match the expected Codeium server stamp of "
.. versions.extension_stamp
.. ". Please update to: https://github.com/Exafunction/codeium/releases/tag/language-server-v"
.. versions.extension
.. " does not match the expected Codeium server stamp of "
.. versions.extension_stamp
.. ". Please update to: https://github.com/Exafunction/codeium/releases/tag/language-server-v"
.. versions.extension
)
callback(nil)
return
Expand All @@ -78,7 +78,7 @@ function M.validate(callback)

notify.warn(
"Codeium.nvim: the version of the Codeium server could not be determined, make sure it matches "
.. versions.extension
.. versions.extension
)
callback(nil)
end,
Expand Down
12 changes: 6 additions & 6 deletions lua/codeium/util.lua
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ function M.get_editor_options(bufnr)

return {
tab_size = M.fallback_call({
{ vim.api.nvim_buf_get_option, bufnr, "shiftwidth" },
{ vim.api.nvim_buf_get_option, bufnr, "tabstop" },
{ vim.api.nvim_get_option, "shiftwidth" },
{ vim.api.nvim_get_option, "tabstop" },
{ vim.api.nvim_buf_get_option, bufnr, "shiftwidth" },
{ vim.api.nvim_buf_get_option, bufnr, "tabstop" },
{ vim.api.nvim_get_option, "shiftwidth" },
{ vim.api.nvim_get_option, "tabstop" },
4,
}, greater_than_zero),
insert_spaces = M.fallback_call({
{ vim.api.nvim_buf_get_option, bufnr, "expandtab" },
{ vim.api.nvim_get_option, "expandtab" },
{ vim.api.nvim_buf_get_option, bufnr, "expandtab" },
{ vim.api.nvim_get_option, "expandtab" },
true,
}),
}
Expand Down
13 changes: 7 additions & 6 deletions lua/codeium/versions.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"version": "1.2.85",
"stamp": "3c46f91ffae2eeb50cb1ca62b60b74de224a06a7",
"version": "1.2.90",
"stamp": "7b00044fee859ddf8cf5e6501e648af5c6587c22",
"hashes": {
"x86_64-linux": "sha256-RNIF+Ie/xOO06SQEZcnMi8+6uTZEtWsmdO52PL5N0F0=",
"aarch64-linux": "07cpm2hb16w9a8xpd34c25xgwmsc1vrr6y2mxvx2p0dkg98gkjcn",
"x86_64-darwin": "0xdcmiwkqi911bw8zm8znlzdwy6w8wb4m2ry05d2zj7p23f0wn7b",
"aarch64-darwin": "152z3qabx0dkrqn6h5ds5fns0qpg5xksbq2yadjqjl1s0z0hdh0q"
"x86_64-linux": "sha256-dGWdn2q6HoAtUEqTqXCr0VXMSfTVwA0SIeMLUw9eR4w=",
"aarch64-linux": "sha256-x2ijEosNN3Vl/qY8vs5bnI6o8dr4ZbuqWbu2p8wy9Do=",
"x86_64-darwin": "sha256-0jctwQxd1WOqc2SZnYBoa5reV7XU5Nv347Z3jkWoGMw=",
"aarch64-darwin": "sha256-w4p4pfmcfpYPr9Axb9joYLnTkOksDhfZI2NkO6BWniI=",
"x86_64-windows": "sha256-Auj09zGsm/d5cuhsYhuurCJ8tq6thdDfHpnw6WZuqVA="
}
}
8 changes: 4 additions & 4 deletions lua/codeium/views/auth-menu.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ local io = require("codeium.io")
local notify = require("codeium.notify")

local function get_key(callback)
local result = vim.fn.inputsecret("Token ")
if result then
callback(result)
end
local result = vim.fn.inputsecret("Token ")
if result then
callback(result)
end
end

local function open_buffer(url, callback)
Expand Down