Skip to content
Open
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
4 changes: 2 additions & 2 deletions lua/litee/lib/config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ M.config = {
tree = {
icon_set = "default",
icon_set_custom = nil,
indent_guides = true
}
indent_guides = true,
},
}

return M
27 changes: 11 additions & 16 deletions lua/litee/lib/details/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ local float_win = nil
-- close_details_popups closes the created popup window
-- if it exists.
function M.close_details_popup()
if float_win ~= nil and
vim.api.nvim_win_is_valid(float_win) then
if float_win ~= nil and vim.api.nvim_win_is_valid(float_win) then
vim.api.nvim_win_close(float_win, true)
float_win = nil
end
Expand All @@ -27,11 +26,11 @@ end
function M.details_popup(state, node, detail_func)
local buf = vim.api.nvim_create_buf(false, true)
if buf == 0 then
vim.api.nvim_err_writeln("details_popup: could not create details buffer")
vim.notify("details_popup: could not create details buffer", vim.log.levels.ERROR)
return
end
vim.api.nvim_buf_set_option(buf, 'bufhidden', 'delete')
vim.api.nvim_buf_set_option(buf, 'syntax', 'yaml')
vim.api.nvim_set_option_value("bufhidden", "delete", { buf = buf })
vim.api.nvim_set_option_value("syntax", "yaml", { buf = buf })

local lines = detail_func(state, node)
if lines == nil then
Expand All @@ -46,18 +45,14 @@ function M.details_popup(state, node, detail_func)
end
end

vim.api.nvim_buf_set_option(buf, 'modifiable', true)
vim.api.nvim_set_option_value("modifiable", true, { buf = buf })
vim.api.nvim_buf_set_lines(buf, 0, #lines, false, lines)
vim.api.nvim_buf_set_option(buf, 'modifiable', false)
local popup_conf = vim.lsp.util.make_floating_popup_options(
width,
#lines,
{
border= "rounded",
focusable= false,
zindex = 99,
}
)
vim.api.nvim_set_option_value("modifiable", false, { buf = buf })
local popup_conf = vim.lsp.util.make_floating_popup_options(width, #lines, {
border = "rounded",
focusable = false,
zindex = 99,
})
float_win = vim.api.nvim_open_win(buf, false, popup_conf)
end

Expand Down
25 changes: 8 additions & 17 deletions lua/litee/lib/highlights/auto.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
local lib_util = require('litee.lib.util')
local lib_hi = require('litee.lib.highlights')
local lib_util = require("litee.lib.util")
local lib_hi = require("litee.lib.highlights")

local M = {}

Expand All @@ -26,12 +26,7 @@ function M.highlight(node, set, win)
if not vim.api.nvim_buf_is_valid(buf) then
return
end
vim.api.nvim_buf_clear_namespace(
buf,
M.higlight_ns,
0,
-1
)
vim.api.nvim_buf_clear_namespace(buf, M.higlight_ns, 0, -1)
if not set then
return
end
Expand All @@ -54,15 +49,11 @@ function M.highlight(node, set, win)
return
end

vim.api.nvim_buf_add_highlight(
buf,
M.higlight_ns,
lib_hi.hls.SymbolJumpHL,
range["start"].line,
range["start"].character,
range["end"].character
)
vim.api.nvim_win_set_cursor(win, {range["start"].line+1, 0})
vim.api.nvim_buf_set_extmark(buf, M.higlight_ns, range["start"].line, range["start"].character, {
end_col = range["end"].character,
hl_group = lib_hi.hls.SymbolJumpHL,
})
vim.api.nvim_win_set_cursor(win, { range["start"].line + 1, 0 })
end

return M
114 changes: 46 additions & 68 deletions lua/litee/lib/highlights/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,81 +3,59 @@ local M = {}
-- hls is a map of UI specific highlights used
-- by the litee.nvim library.
M.hls = {
SymbolDetailHL = "LTSymbolDetail",
SymbolHL = "LTSymbol",
SymbolJumpHL = "LTSymbolJump",
SymbolJumpRefsHL = "LTSymbolJumpRefs",
IndentGuideHL = "LTIndentGuide",
ExpandedGuideHL = "LTExpandedGuide",
CollapsedGuideHL = "LTCollapsedGuide",
SelectFiletreeHL = "LTSelectFiletree",
NormalSB = "LTNormalSB"
SymbolDetailHL = "LTSymbolDetail",
SymbolHL = "LTSymbol",
SymbolJumpHL = "LTSymbolJump",
SymbolJumpRefsHL = "LTSymbolJumpRefs",
IndentGuideHL = "LTIndentGuide",
ExpandedGuideHL = "LTExpandedGuide",
CollapsedGuideHL = "LTCollapsedGuide",
SelectFiletreeHL = "LTSelectFiletree",
NormalSB = "LTNormalSB",
SymbolNameColor0 = "LTSymbolNameColor0",
SymbolNameColor1 = "LTSymbolNameColor1",
SymbolNameColor2 = "LTSymbolNameColor2",
SymbolNameColor3 = "LTSymbolNameColor3",
SymbolNameColor4 = "LTSymbolNameColor4",
SymbolNameColor5 = "LTSymbolNameColor5",
}

-- setup_default_highlights configures a list of default
-- highlights for the litee.nvim library.
function M.setup_default_highlights()
local dark = {
LTBoolean = 'hi LTBoolean guifg=#0087af guibg=None',
LTConstant = 'hi LTConstant guifg=#0087af guibg=None',
LTConstructor = 'hi LTConstructor guifg=#4DC5C6 guibg=None',
LTField = 'hi LTField guifg=#0087af guibg=None',
LTFunction = 'hi LTFunction guifg=#988ACF guibg=None',
LTMethod = 'hi LTMethod guifg=#0087af guibg=None',
LTNamespace = 'hi LTNamespace guifg=#87af87 guibg=None',
LTNumber = 'hi LTNumber guifg=#9b885c guibg=None',
LTOperator = 'hi LTOperator guifg=#988ACF guibg=None',
LTParameter = 'hi LTParameter guifg=#988ACF guibg=None',
LTParameterReference = 'hi LTParameterReference guifg=#4DC5C6 guibg=None',
LTString = 'hi LTString guifg=#af5f5f guibg=None',
LTSymbol = 'hi LTSymbol guifg=#87afd7 ',
LTSymbolDetail = 'hi LTSymbolDetail ctermfg=024 cterm=italic guifg=#988ACF gui=italic',
LTSymbolJump = 'hi LTSymbolJump ctermfg=015 ctermbg=110 cterm=italic,bold,underline guifg=#464646 guibg=#87afd7 gui=italic,bold',
LTSymbolJumpRefs = 'hi LTSymbolJumpRefs ctermfg=015 ctermbg=110 cterm=italic,bold,underline guifg=#464646 guibg=#9b885c gui=italic,bold',
LTType = 'hi LTType guifg=#9b885c guibg=None',
LTURI = 'hi LTURI guifg=#988ACF guibg=None',
LTIndentGuide = 'hi LTIndentGuide guifg=None guibg=None',
LTExpandedGuide = 'hi LTExpandedGuide guifg=None guibg=None',
LTCollapsedGuide = 'hi LTCollapsedGuide guifg=None guibg=None',
LTSelectFiletree = 'hi LTSelectFiletree ctermbg=131 ctermfg=246 cterm=None guibg=#af5f5f guifg=#e4e4e4 gui=None'
LTBoolean = "hi LTBoolean guifg=#0087af guibg=None",
LTConstant = "hi LTConstant guifg=#0087af guibg=None",
LTConstructor = "hi LTConstructor guifg=#4DC5C6 guibg=None",
LTField = "hi LTField guifg=#0087af guibg=None",
LTFunction = "hi LTFunction guifg=#988ACF guibg=None",
LTMethod = "hi LTMethod guifg=#0087af guibg=None",
LTNamespace = "hi LTNamespace guifg=#87af87 guibg=None",
LTNumber = "hi LTNumber guifg=#9b885c guibg=None",
LTOperator = "hi LTOperator guifg=#988ACF guibg=None",
LTParameter = "hi LTParameter guifg=#988ACF guibg=None",
LTParameterReference = "hi LTParameterReference guifg=#4DC5C6 guibg=None",
LTString = "hi LTString guifg=#af5f5f guibg=None",
LTSymbol = "hi LTSymbol guifg=#87afd7 ",
LTSymbolDetail = "hi LTSymbolDetail ctermfg=024 cterm=italic guifg=#988ACF gui=italic",
LTSymbolJump = "hi LTSymbolJump ctermfg=015 ctermbg=110 cterm=italic,bold,underline guifg=#464646 guibg=#87afd7 gui=italic,bold",
LTSymbolJumpRefs = "hi LTSymbolJumpRefs ctermfg=015 ctermbg=110 cterm=italic,bold,underline guifg=#464646 guibg=#9b885c gui=italic,bold",
LTType = "hi LTType guifg=#9b885c guibg=None",
LTURI = "hi LTURI guifg=#988ACF guibg=None",
LTIndentGuide = "hi LTIndentGuide guifg=None guibg=None",
LTExpandedGuide = "hi LTExpandedGuide guifg=None guibg=None",
LTCollapsedGuide = "hi LTCollapsedGuide guifg=None guibg=None",
LTSelectFiletree = "hi LTSelectFiletree ctermbg=131 ctermfg=246 cterm=None guibg=#af5f5f guifg=#e4e4e4 gui=None",
LTSymbolNameColor0 = "hi LTSymbolNameColor0 guifg=#8CCBEA guibg=None",
LTSymbolNameColor1 = "hi LTSymbolNameColor1 guifg=#A4E57E guibg=None",
LTSymbolNameColor2 = "hi LTSymbolNameColor2 guifg=#FFDB72 guibg=None",
LTSymbolNameColor3 = "hi LTSymbolNameColor3 guifg=#FF7272 guibg=None",
LTSymbolNameColor4 = "hi LTSymbolNameColor4 guifg=#FFB3FF guibg=None",
LTSymbolNameColor5 = "hi LTSymbolNameColor5 guifg=#9999FF guibg=None",
}
local light = {
LTBoolean = 'hi LTBoolean guifg=#005f87 guibg=None',
LTConstant = 'hi LTConstant guifg=#005f87 guibg=None',
LTConstructor = 'hi LTConstructor guifg=#9b885c guibg=None',
LTField = 'hi LTField guifg=#005f87 guibg=None',
LTFunction = 'hi LTFunction guifg=#806CCF guibg=None',
LTMethod = 'hi LTMethod guifg=#005f87 guibg=None',
LTNamespace = 'hi LTNamespace guifg=#87af87 guibg=None',
LTNumber = 'hi LTNumber guifg=#9b885c guibg=None',
LTOperator = 'hi LTOperator guifg=#806CCF guibg=None',
LTParameter = 'hi LTParameter guifg=#806CCF guibg=None',
LTParameterReference = 'hi LTParameterReference guifg=#268889 guibg=None',
LTString = 'hi LTString guifg=#af5f5f guibg=None',
LTSymbol = 'hi LTSymbol guifg=#806CCF gui=underline',
LTSymbolDetail = 'hi LTSymbolDetail ctermfg=024 cterm=italic guifg=#005f87 gui=italic',
LTSymbolJump = 'hi LTSymbolJump ctermfg=015 ctermbg=110 cterm=italic,bold,underline guifg=#464646 guibg=#87afd7 gui=italic,bold',
LTSymbolJumpRefs = 'hi LTSymbolJumpRefs ctermfg=015 ctermbg=110 cterm=italic,bold,underline guifg=#464646 guibg=#9b885c gui=italic,bold',
LTType = 'hi LTType guifg=#268889 guibg=None',
LTURI = 'hi LTURI guifg=#806CCF guibg=None',
LTIndentGuide = 'hi LTIndentGuide guifg=None guibg=None',
LTExpandedGuide = 'hi LTExpandedGuide guifg=None guibg=None',
LTCollapsedGuide = 'hi LTCollapsedGuide guifg=None guibg=None',
LTSelectFiletree = 'hi LTSelectFiletree ctermbg=131 ctermfg=246 cterm=None guibg=#af5f5f guifg=#e4e4e4 gui=None'
}
local bg = vim.api.nvim_get_option("background")
if bg == "dark" then
for hl_name, hl in pairs(dark) do
if vim.fn.hlexists(hl_name) == 0 then
vim.cmd(hl)
end
end
end
if bg == "light" then
for hl_name, hl in pairs(light) do
if vim.fn.hlexists(hl_name) == 0 then
vim.cmd(hl)
end
for hl_name, hl in pairs(dark) do
if vim.fn.hlexists(hl_name) == 0 then
vim.cmd(hl)
end
end
end
Expand Down
Loading