Merge 'upstream/master' Run stylua

This commit is contained in:
Damjan 9000 2023-12-03 20:44:17 +01:00
commit a54945c75a
2 changed files with 8 additions and 8 deletions

View File

@ -12,7 +12,7 @@ cmp.setup {
end,
},
completion = {
completeopt = 'menu,menuone,noinsert'
completeopt = 'menu,menuone,noinsert',
},
mapping = cmp.mapping.preset.insert {
['<C-n>'] = cmp.mapping.select_next_item(),

View File

@ -22,17 +22,17 @@ local function find_git_root()
local current_dir
local cwd = vim.fn.getcwd()
-- If the buffer is not associated with a file, return nil
if current_file == "" then
if current_file == '' then
current_dir = cwd
else
-- Extract the directory from the current file's path
current_dir = vim.fn.fnamemodify(current_file, ":h")
current_dir = vim.fn.fnamemodify(current_file, ':h')
end
-- Find the Git root directory from the current file's path
local git_root = vim.fn.systemlist("git -C " .. vim.fn.escape(current_dir, " ") .. " rev-parse --show-toplevel")[1]
local git_root = vim.fn.systemlist('git -C ' .. vim.fn.escape(current_dir, ' ') .. ' rev-parse --show-toplevel')[1]
if vim.v.shell_error ~= 0 then
print("Not a git repository. Searching on current working directory")
print 'Not a git repository. Searching on current working directory'
return cwd
end
return git_root
@ -42,9 +42,9 @@ end
local function live_grep_git_root()
local git_root = find_git_root()
if git_root then
require('telescope.builtin').live_grep({
require('telescope.builtin').live_grep {
search_dirs = { git_root },
})
}
end
end