mirror of
https://github.com/LazyVim/LazyVim.git
synced 2025-06-29 12:10:12 +02:00
refactor: temp code for better fzf_colors
This commit is contained in:
parent
26254487fb
commit
6a07e6522a
3 changed files with 24 additions and 22 deletions
|
@ -162,27 +162,27 @@ return {
|
|||
Separator = "FzfColorsBorder",
|
||||
}
|
||||
for name, link in pairs(links) do
|
||||
name = "FzfColors" .. name
|
||||
name = "FzfLuaColors" .. name
|
||||
vim.api.nvim_set_hl(0, name, { link = link, default = true })
|
||||
end
|
||||
opts.fzf_colors = {
|
||||
["fg"] = { "fg", "FzfColorsNormal" },
|
||||
["bg"] = { "bg", "FzfColorsNormal" },
|
||||
["hl"] = { "fg", "FzfColorsMatch" },
|
||||
["fg+"] = { "fg", "FzfColorsCursorLine" },
|
||||
["bg+"] = { "bg", "FzfColorsCursorLine" },
|
||||
["hl+"] = { "fg", "FzfColorsMatch" },
|
||||
["info"] = { "fg", "FzfColorsInfo" },
|
||||
["border"] = { "fg", "FzfColorsBorder" },
|
||||
["separator"] = { "fg", "FzfColorsSeparator" },
|
||||
["scrollbar"] = { "fg", "FzfColorsScrollbar" },
|
||||
["gutter"] = { "bg", "FzfColorsGutter" },
|
||||
["query"] = { "fg", "FzfColorsQuery", "regular" },
|
||||
["prompt"] = { "fg", "FzfColorsPrompt" },
|
||||
["pointer"] = { "fg", "FzfColorsPointer" },
|
||||
["marker"] = { "fg", "FzfColorsMarker" },
|
||||
["spinner"] = { "fg", "FzfColorsSpinner" },
|
||||
["header"] = { "fg", "FzfColorsHeader" },
|
||||
["fg"] = { "fg", "FzfLuaColorsNormal" },
|
||||
["bg"] = { "bg", "FzfLuaColorsNormal" },
|
||||
["hl"] = { "fg", "FzfLuaColorsMatch" },
|
||||
["fg+"] = { "fg", "FzfLuaColorsCursorLine" },
|
||||
["bg+"] = { "bg", "FzfLuaColorsCursorLine" },
|
||||
["hl+"] = { "fg", "FzfLuaColorsMatch" },
|
||||
["info"] = { "fg", "FzfLuaColorsInfo" },
|
||||
["border"] = { "fg", "FzfLuaColorsBorder" },
|
||||
["separator"] = { "fg", "FzfLuaColorsSeparator" },
|
||||
["scrollbar"] = { "fg", "FzfLuaColorsScrollbar" },
|
||||
["gutter"] = { "bg", "FzfLuaColorsGutter" },
|
||||
["query"] = { "fg", "FzfLuaColorsQuery", "regular" },
|
||||
["prompt"] = { "fg", "FzfLuaColorsPrompt" },
|
||||
["pointer"] = { "fg", "FzfLuaColorsPointer" },
|
||||
["marker"] = { "fg", "FzfLuaColorsMarker" },
|
||||
["spinner"] = { "fg", "FzfLuaColorsSpinner" },
|
||||
["header"] = { "fg", "FzfLuaColorsHeader" },
|
||||
}
|
||||
end,
|
||||
},
|
||||
|
|
|
@ -9,6 +9,7 @@ local M = setmetatable({}, {
|
|||
---@class lazyvim.util.pick.Opts: table<string, any>
|
||||
---@field root? boolean
|
||||
---@field cwd? string
|
||||
---@field buf? number
|
||||
---@field show_untracked? boolean
|
||||
|
||||
---@type table<string, string>
|
||||
|
@ -30,7 +31,7 @@ function M.open(command, opts)
|
|||
end
|
||||
|
||||
if not opts.cwd and opts.root ~= false then
|
||||
opts.cwd = LazyVim.root()
|
||||
opts.cwd = LazyVim.root({ buf = opts.buf })
|
||||
end
|
||||
|
||||
local cwd = opts.cwd or vim.uv.cwd()
|
||||
|
|
|
@ -168,13 +168,14 @@ end
|
|||
-- * lsp root_dir
|
||||
-- * root pattern of filename of the current buffer
|
||||
-- * root pattern of cwd
|
||||
---@param opts? {normalize?:boolean}
|
||||
---@param opts? {normalize?:boolean, buf?:number}
|
||||
---@return string
|
||||
function M.get(opts)
|
||||
local buf = vim.api.nvim_get_current_buf()
|
||||
opts = opts or {}
|
||||
local buf = opts.buf or vim.api.nvim_get_current_buf()
|
||||
local ret = M.cache[buf]
|
||||
if not ret then
|
||||
local roots = M.detect({ all = false })
|
||||
local roots = M.detect({ all = false, buf = buf })
|
||||
ret = roots[1] and roots[1].paths[1] or vim.uv.cwd()
|
||||
M.cache[buf] = ret
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue