chris/nvim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some things

Browse Source
This commit is contained in:
Chris
2025-11-15 13:55:47 +00:00
parent 344623eaf6
commit 1c96d03649
3 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lua/helpers.lua
View File

@@ -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

4
lua/plugins/codecompanion.lua
View File

@@ -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 = {

74
lua/snippets/php.lua
View File

@@ -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)