nvim: deprecate treesitter-context for navic
This commit is contained in:
parent
086d2a18dd
commit
6e6cdc261b
3 changed files with 70 additions and 87 deletions
|
|
@ -1,50 +1,50 @@
|
|||
local M = {
|
||||
"nvim-lualine/lualine.nvim",
|
||||
dependencies = { "kyazdani42/nvim-web-devicons" },
|
||||
event = "VeryLazy",
|
||||
"nvim-lualine/lualine.nvim",
|
||||
dependencies = { "kyazdani42/nvim-web-devicons" },
|
||||
event = "VeryLazy",
|
||||
}
|
||||
|
||||
local function clock()
|
||||
return os.date("%H:%M")
|
||||
return os.date("%H:%M")
|
||||
end
|
||||
|
||||
function M.config()
|
||||
local lualine = require("lualine")
|
||||
local lualine = require("lualine")
|
||||
|
||||
lualine.setup({
|
||||
options = {
|
||||
globalstatus = true,
|
||||
theme = "onelight",
|
||||
component_separators = { left = "╲", right = "╱" },
|
||||
section_separators = { left = "", right = "" },
|
||||
},
|
||||
sections = {
|
||||
lualine_c = {
|
||||
{
|
||||
"filename",
|
||||
path = 1,
|
||||
file_status = true,
|
||||
},
|
||||
{
|
||||
function()
|
||||
local navic = require("nvim-navic")
|
||||
local ret = navic.get_location()
|
||||
return ret:len() > 2000 and "navic error" or ret
|
||||
end,
|
||||
cond = function()
|
||||
if package.loaded["nvim-navic"] then
|
||||
local navic = require("nvim-navic")
|
||||
return navic.is_available()
|
||||
end
|
||||
end,
|
||||
color = { fg = "#d66622" },
|
||||
},
|
||||
},
|
||||
lualine_x = { "filetype" },
|
||||
lualine_y = { "location", "progress" },
|
||||
lualine_z = { clock },
|
||||
},
|
||||
})
|
||||
lualine.setup({
|
||||
options = {
|
||||
globalstatus = true,
|
||||
theme = "onelight",
|
||||
component_separators = { left = "╲", right = "╱" },
|
||||
section_separators = { left = "", right = "" },
|
||||
},
|
||||
sections = {
|
||||
lualine_c = {
|
||||
{
|
||||
"filename",
|
||||
path = 1,
|
||||
file_status = true,
|
||||
},
|
||||
{
|
||||
function()
|
||||
local navic = require("nvim-navic")
|
||||
local ret = navic.get_location()
|
||||
return ret:len() > 2000 and "navic error" or ret
|
||||
end,
|
||||
cond = function()
|
||||
if package.loaded["nvim-navic"] then
|
||||
local navic = require("nvim-navic")
|
||||
return navic.is_available()
|
||||
end
|
||||
end,
|
||||
color = { fg = "#ff8f00" },
|
||||
},
|
||||
},
|
||||
lualine_x = { "filetype" },
|
||||
lualine_y = { "location" },
|
||||
lualine_z = { clock },
|
||||
},
|
||||
})
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
local M = {
|
||||
"nvim-treesitter/nvim-treesitter-context",
|
||||
dependencies = {
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
},
|
||||
}
|
||||
|
||||
function M.config()
|
||||
local config = require("treesitter-context")
|
||||
config.setup({
|
||||
enable = true, -- Enable this plugin (Can be enabled/disabled later via commands)
|
||||
max_lines = 0, -- How many lines the window should span. Values <= 0 mean no limit.
|
||||
patterns = { -- Match patterns for TS nodes. These get wrapped to match at word boundaries.
|
||||
-- For all filetypes
|
||||
-- Note that setting an entry here replaces all other patterns for this entry.
|
||||
-- By setting the 'default' entry below, you can control which nodes you want to
|
||||
-- appear in the context window.
|
||||
default = {
|
||||
"class",
|
||||
"function",
|
||||
"method",
|
||||
-- 'for', -- These won't appear in the context
|
||||
-- 'while',
|
||||
-- 'if',
|
||||
-- 'switch',
|
||||
-- 'case',
|
||||
},
|
||||
-- Example for a specific filetype.
|
||||
-- If a pattern is missing, *open a PR* so everyone can benefit.
|
||||
-- rust = {
|
||||
-- 'impl_item',
|
||||
-- },
|
||||
},
|
||||
exact_patterns = {
|
||||
-- Example for a specific filetype with Lua patterns
|
||||
-- Treat patterns.rust as a Lua pattern (i.e "^impl_item$" will
|
||||
-- exactly match "impl_item" only)
|
||||
-- rust = true,
|
||||
},
|
||||
|
||||
-- [!] The options below are exposed but shouldn't require your attention,
|
||||
-- you can safely ignore them.
|
||||
|
||||
zindex = 20, -- The Z-index of the context window
|
||||
})
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
@ -58,6 +58,37 @@ function M.config()
|
|||
GitSignsChangeNr({ fg = "#FFE0B2" }),
|
||||
|
||||
IlluminatedWordText({ bg = "#FFEB3B" }),
|
||||
NavicIcons({ fg = "#cc0000" }),
|
||||
|
||||
NavicIconsFile({ fg = "#cc0000" }),
|
||||
NavicIconsModule({ fg = "#cc0000" }),
|
||||
NavicIconsNamespace({ fg = "#cc0000" }),
|
||||
NavicIconsPackage({ fg = "#cc0000" }),
|
||||
NavicIconsClass({ fg = "#cc0000" }),
|
||||
NavicIconsMethod({ fg = "#cc0000" }),
|
||||
NavicIconsProperty({ fg = "#cc0000" }),
|
||||
NavicIconsField({ fg = "#cc0000" }),
|
||||
NavicIconsConstructor({ fg = "#cc0000" }),
|
||||
NavicIconsEnum({ fg = "#cc0000" }),
|
||||
NavicIconsInterface({ fg = "#cc0000" }),
|
||||
NavicIconsFunction({ fg = "#cc0000" }),
|
||||
NavicIconsVariable({ fg = "#cc0000" }),
|
||||
NavicIconsConstant({ fg = "#cc0000" }),
|
||||
NavicIconsString({ fg = "#cc0000" }),
|
||||
NavicIconsNumber({ fg = "#cc0000" }),
|
||||
NavicIconsBoolean({ fg = "#cc0000" }),
|
||||
NavicIconsArray({ fg = "#cc0000" }),
|
||||
NavicIconsObject({ fg = "#cc0000" }),
|
||||
NavicIconsKey({ fg = "#cc0000" }),
|
||||
NavicIconsKeyword({ fg = "#cc0000" }),
|
||||
NavicIconsNull({ fg = "#cc0000" }),
|
||||
NavicIconsEnumMember({ fg = "#cc0000" }),
|
||||
NavicIconsStruct({ fg = "#cc0000" }),
|
||||
NavicIconsEvent({ fg = "#cc0000" }),
|
||||
NavicIconsOperator({ fg = "#cc0000" }),
|
||||
NavicIconsTypeParameter({ fg = "#cc0000" }),
|
||||
|
||||
NavicText({ fg = "#cc0000", gui = "italic" }),
|
||||
|
||||
-- LspCodeLens({ fg = "#00ff00", gui = "undercurl" }),
|
||||
-- LspSignatureActiveParameter({ fg = "#ff0000", bg = "#ffffcc" }),
|
||||
|
|
|
|||
Loading…
Reference in a new issue