diff --git a/lua/helpers.lua b/lua/helpers.lua index 3593f70..edcafe8 100644 --- a/lua/helpers.lua +++ b/lua/helpers.lua @@ -51,7 +51,7 @@ helpers.open_term = function(opts) end helpers.has_copilot = function() - return vim.fn.getenv('COPILOT_API_KEY') ~= nil + return vim.fn.getenv('COPILOT_API_KEY') ~= vim.NIL end return helpers diff --git a/lua/plugins/codecompanion.lua b/lua/plugins/codecompanion.lua index 021a497..ada360f 100644 --- a/lua/plugins/codecompanion.lua +++ b/lua/plugins/codecompanion.lua @@ -21,8 +21,8 @@ return { env = { url = vim.env.DEFAULT_OPENAI_API_BASE, api_key = vim.env.DEFAULT_OPENAI_API_KEY, - chat_url = '/chat/completions', - models_endpoint = '/models', + chat_url = '/v1/chat/completions', + models_endpoint = '/v1/models', }, schema = { model = { diff --git a/lua/snippets/php.lua b/lua/snippets/php.lua index 346f496..99ab8f8 100644 --- a/lua/snippets/php.lua +++ b/lua/snippets/php.lua @@ -5,43 +5,43 @@ local i = ls.insert_node local f = ls.function_node local function psr_namespace(_, snip) - local path = snip.env.TM_FILENAME_FULL or '' - -- Get the directory of the path - local dir = vim.fs.dirname(path) - -- Loop through parent directories to find composer.json - while dir ~= '/' and dir ~= nil do - local composer_json_path = dir .. '/composer.json' - if vim.fn.filereadable(composer_json_path) == 1 then - break - end - dir = vim.fs.dirname(dir) - end - -- If no composer.json found, return empty string - if dir == '/' or dir == nil then - return '' - end - - -- Decode composer.json and get PSR-4 autoload mappings - local composer = vim.json.decode(vim.iter(vim.fn.readfile(dir .. '/composer.json')):join '') - local psr4 = composer['autoload'] and composer['autoload']['psr-4'] - - -- If no PSR-4 mappings, return empty string - if not psr4 then - return '' - end - - -- Get the relative path from the composer.json directory - local relative_path = path:sub(#dir + 2) - -- Loop through PSR-4 mappings - for namespace, map in pairs(psr4) do - -- Check if the relative path matches the mapping - if relative_path:match('^' .. map:gsub('/', '%%/')) then - -- Extract the suffix of the path after the mapping, removing the filename - local suffix = relative_path:sub(#map + 2):match('^(.*)/[^/]+%.php$') or '' - local trimmed = namespace:gsub('\\$', '') - return trimmed .. (suffix ~= '' and ('\\' .. suffix:gsub('/', '\\')) or '') - end - end + -- local path = snip.env.TM_FILENAME_FULL or '' + -- -- Get the directory of the path + -- local dir = vim.fs.dirname(path) + -- -- Loop through parent directories to find composer.json + -- while dir ~= '/' and dir ~= nil do + -- local composer_json_path = dir .. '/composer.json' + -- if vim.fn.filereadable(composer_json_path) == 1 then + -- break + -- end + -- dir = vim.fs.dirname(dir) + -- end + -- -- If no composer.json found, return empty string + -- if dir == '/' or dir == nil then + -- return '' + -- end + -- + -- -- Decode composer.json and get PSR-4 autoload mappings + -- local composer = vim.json.decode(vim.iter(vim.fn.readfile(dir .. '/composer.json')):join '') + -- local psr4 = composer['autoload'] and composer['autoload']['psr-4'] + -- + -- -- If no PSR-4 mappings, return empty string + -- if not psr4 then + -- return '' + -- end + -- + -- -- Get the relative path from the composer.json directory + -- local relative_path = path:sub(#dir + 2) + -- -- Loop through PSR-4 mappings + -- for namespace, map in pairs(psr4) do + -- -- Check if the relative path matches the mapping + -- if relative_path:match('^' .. map:gsub('/', '%%/')) then + -- -- Extract the suffix of the path after the mapping, removing the filename + -- local suffix = relative_path:sub(#map + 2):match('^(.*)/[^/]+%.php$') or '' + -- local trimmed = namespace:gsub('\\$', '') + -- return trimmed .. (suffix ~= '' and ('\\' .. suffix:gsub('/', '\\')) or '') + -- end + -- end end local function class_name(args, snip)