update
This commit is contained in:
+15
-13
@@ -1,45 +1,47 @@
|
||||
{
|
||||
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
|
||||
"base16-nvim": { "branch": "master", "commit": "09944b3120451d2881dc8cfb13c85c11949f477d" },
|
||||
"blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" },
|
||||
"bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" },
|
||||
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
|
||||
"cmake-tools.nvim": { "branch": "master", "commit": "22859d754b5de738cfe9945e0910729f63deefd0" },
|
||||
"conform.nvim": { "branch": "master", "commit": "619363c30309d29ffa631e67c8183f2a72caa373" },
|
||||
"conform.nvim": { "branch": "master", "commit": "016802de402556da54c36bd7359b441266b01cdd" },
|
||||
"dashboard-nvim": { "branch": "master", "commit": "f787e3462c2ee2b6117b17c1aa4ddf66cb6f57fe" },
|
||||
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
|
||||
"dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
|
||||
"flash.nvim": { "branch": "main", "commit": "b6346946d10d07998efee029fb0f7a593806d0cd" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "31d6fb2d618bca1482b9f274751ead5f03461408" },
|
||||
"flash.nvim": { "branch": "main", "commit": "5f0f270fdc7c5b0c21d903ee85b9cb06f2ac636a" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "5be654f2232c10ddcad19c1607a67b6b4b78fc29" },
|
||||
"indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
|
||||
"lazygit.nvim": { "branch": "main", "commit": "a04ad0dbc725134edbee3a5eea29290976695357" },
|
||||
"lspsaga.nvim": { "branch": "main", "commit": "cf6fc9473bba1d332eda9887855ea29ed9b37701" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "a4068c3ebd4cb335b25239e5ea35c22ee6007962" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "9d28935aa95fa6c1dc7c4d6747f101a72a8a4bec" },
|
||||
"mason-nvim-dap.nvim": { "branch": "main", "commit": "9a10e096703966335bd5c46c8c875d5b0690dade" },
|
||||
"mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" },
|
||||
"noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
|
||||
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "7b9923abad60b903ece7c52940e1321d39eccc79" },
|
||||
"nui.nvim": { "branch": "main", "commit": "10fc361835c856ba4233ef5ea135b919bf3dce97" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "430522f95fe4fb7c511ec64f8c1a90cc6a66c05c" },
|
||||
"nvim-dap": { "branch": "master", "commit": "9e848e09a697ee95302a3ef2dd43fd6eb709e570" },
|
||||
"nvim-dap-ui": { "branch": "master", "commit": "cc9dd33aade7f20bae414d0cba163bc60d4d4b43" },
|
||||
"nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "b386c50cd7816f8c8a2b13b298a218af1f5a75c6" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "221c43884319e791519f0d6c94a7f2fbcd653278" },
|
||||
"nvim-nio": { "branch": "master", "commit": "edcc181a875301dd21840189aa2f2f9ad69fc172" },
|
||||
"nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
|
||||
"nvim-surround": { "branch": "main", "commit": "2e93e154de9ff326def6480a4358bfc149d5da2c" },
|
||||
"nvim-tree.lua": { "branch": "master", "commit": "4213bd6eabac38b16dd6615002b6243b23cf3bf6" },
|
||||
"nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
|
||||
"nvim-tree.lua": { "branch": "master", "commit": "531b807b8f0d6f75016a0ee1e0cd5ce2086e9d95" },
|
||||
"nvim-treesitter": { "branch": "main", "commit": "e82ef6ae2c3eeb96c6916b29917f96bf630b2cdb" },
|
||||
"nvim-ufo": { "branch": "main", "commit": "ab3eb124062422d276fae49e0dd63b3ad1062cfc" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "0ca28b61a04fe7426cefbdd52c2647ef0e335b5f" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "2ae6958df7ced50baac5035cec0c15799eedfbf7" },
|
||||
"oil.nvim": { "branch": "master", "commit": "b73018b75affd13fa38e2fc94ef753b465f770d7" },
|
||||
"persistent-breakpoints.nvim": { "branch": "main", "commit": "d1656221836207787b8a7969cc2dc72668c4742a" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
|
||||
"promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
|
||||
"rainbow-delimiters.nvim": { "branch": "master", "commit": "a798325b7f36acc62741d1029930a7b96d4dd4bf" },
|
||||
"rustaceanvim": { "branch": "main", "commit": "614a3e30e6e94c5aee204fe5d5b6a50cdaac4be6" },
|
||||
"rainbow-delimiters.nvim": { "branch": "master", "commit": "012f1480cd9a5fc99fce7678e0a536421a53fc46" },
|
||||
"rustaceanvim": { "branch": "main", "commit": "88575b98bb9937fb9983ddec5e532b67e75ce677" },
|
||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "b25b749b9db64d375d782094e2b9dce53ad53a40" },
|
||||
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
|
||||
"telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "40aedd8a68c78a656a10a8d62d80c54af59420fb" },
|
||||
"toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
|
||||
"tokyonight.nvim": { "branch": "main", "commit": "cdc07ac78467a233fd62c493de29a17e0cf2b2b6" },
|
||||
"vim-illuminate": { "branch": "master", "commit": "91313e598ca62e110bc71535c49069b66b9883c9" },
|
||||
|
||||
@@ -79,9 +79,36 @@ keymap("n", "<leader>sv", "<cmd>vsplit<cr>", { desc = "垂直分屏" })
|
||||
keymap("n", "<leader>sh", "<cmd>split<cr>", { desc = "水平分屏" })
|
||||
keymap("n", "<leader>sc", "<cmd>close<cr>", { desc = "关闭窗口" })
|
||||
|
||||
-- Buffer 导航
|
||||
keymap("n", "<S-h>", "<cmd>bprevious<cr>", { desc = "下一个 buffer" })
|
||||
keymap("n", "<S-l>", "<cmd>bnext<cr>", { desc = "上一个 buffer" })
|
||||
-- Buffer 导航(跳过终端类 buffer)
|
||||
local function skip_terminal_buffers(direction)
|
||||
local bufs = vim.api.nvim_list_bufs()
|
||||
-- 收集所有可显示、非终端、非特殊类型的 buffer
|
||||
local valid = {}
|
||||
for _, b in ipairs(bufs) do
|
||||
if vim.api.nvim_buf_is_loaded(b) and vim.bo[b].buflisted then
|
||||
local bt = vim.bo[b].buftype
|
||||
-- 跳过 terminal/nofile/help/quickfix 等
|
||||
if bt == "" or bt == "acwrite" then
|
||||
table.insert(valid, b)
|
||||
end
|
||||
end
|
||||
end
|
||||
if #valid == 0 then return end
|
||||
|
||||
-- 找当前 buffer 在 valid 列表中的位置
|
||||
local current = vim.api.nvim_get_current_buf()
|
||||
local idx = 1
|
||||
for i, b in ipairs(valid) do
|
||||
if b == current then idx = i break end
|
||||
end
|
||||
|
||||
-- 按方向计算下一个(-1 = previous, 1 = next)
|
||||
local next_idx = (idx + direction - 1) % #valid + 1
|
||||
vim.api.nvim_set_current_buf(valid[next_idx])
|
||||
end
|
||||
|
||||
keymap("n", "<S-h>", function() skip_terminal_buffers(-1) end, { desc = "上一个 buffer" })
|
||||
keymap("n", "<S-l>", function() skip_terminal_buffers(1) end, { desc = "下一个 buffer" })
|
||||
|
||||
-- Buffer 操作
|
||||
keymap("n", "<leader>bc", "<cmd>Bdelete<cr>", { desc = "关闭当前 buffer" })
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
local M = {}
|
||||
|
||||
function M.setup()
|
||||
require('base16-colorscheme').setup({
|
||||
base00 = '#101418',
|
||||
base01 = '#1c2025',
|
||||
base02 = '#272a2f',
|
||||
base03 = '#8a919c',
|
||||
base04 = '#c0c7d3',
|
||||
base05 = '#e0e2e9',
|
||||
base06 = '#e0e2e9',
|
||||
base07 = '#e0e2e9',
|
||||
base08 = '#ffb4ab',
|
||||
base09 = '#ecb2ff',
|
||||
base0A = '#adc9ec',
|
||||
base0B = '#9dcaff',
|
||||
base0C = '#ecb2ff',
|
||||
base0D = '#9dcaff',
|
||||
base0E = '#adc9ec',
|
||||
base0F = '#d1e4ff',
|
||||
})
|
||||
|
||||
local hi = function(group, opts)
|
||||
vim.api.nvim_set_hl(0, group, opts)
|
||||
end
|
||||
|
||||
hi('TelescopeNormal', { fg = '#e0e2e9', bg = '#101418' })
|
||||
hi('TelescopeBorder', { fg = '#8a919c', bg = '#101418' })
|
||||
hi('TelescopePromptNormal', { fg = '#e0e2e9', bg = '#101418' })
|
||||
hi('TelescopePromptBorder', { fg = '#8a919c', bg = '#101418' })
|
||||
hi('TelescopePromptPrefix', { fg = '#9dcaff', bg = '#101418' })
|
||||
hi('TelescopePromptCounter', { fg = '#c0c7d3', bg = '#101418' })
|
||||
hi('TelescopePromptTitle', { fg = '#101418', bg = '#9dcaff' })
|
||||
hi('TelescopePreviewTitle', { fg = '#101418', bg = '#adc9ec' })
|
||||
hi('TelescopeResultsTitle', { fg = '#101418', bg = '#ecb2ff' })
|
||||
hi('TelescopeSelection', { fg = '#e0e2e9', bg = '#272a2f' })
|
||||
hi('TelescopeSelectionCaret', { fg = '#9dcaff', bg = '#272a2f' })
|
||||
hi('TelescopeMatching', { fg = '#9dcaff', bold = true })
|
||||
end
|
||||
|
||||
-- Register a signal handler for SIGUSR1 (matugen updates).
|
||||
-- The handler re-requires this module, which re-runs the code below, so the
|
||||
-- previous handle is stopped first; otherwise handlers double on every signal.
|
||||
if _G.__matugen_signal then
|
||||
_G.__matugen_signal:stop()
|
||||
_G.__matugen_signal:close()
|
||||
end
|
||||
|
||||
local signal = vim.uv.new_signal()
|
||||
_G.__matugen_signal = signal
|
||||
signal:start(
|
||||
'sigusr1',
|
||||
vim.schedule_wrap(function()
|
||||
package.loaded['matugen'] = nil
|
||||
require('matugen').setup()
|
||||
end)
|
||||
)
|
||||
|
||||
return M
|
||||
@@ -0,0 +1,6 @@
|
||||
return { 'RRethy/base16-nvim',
|
||||
config = function()
|
||||
local ok, matugen = pcall(require, 'matugen')
|
||||
if ok then matugen.setup() end
|
||||
end,
|
||||
}
|
||||
@@ -15,6 +15,8 @@ return {
|
||||
cmake_generate_options = { "-DCMAKE_EXPORT_COMPILE_COMMANDS=1" },
|
||||
cmake_build_directory = "build",
|
||||
cmake_soft_link_compile_commands = true,
|
||||
cmake_parallel_jobs = tostring(vim.loop.cpu_info() and #vim.loop.cpu_info() or 8),
|
||||
cmake_build_options = { "--parallel", tostring(vim.loop.cpu_info() and #vim.loop.cpu_info() or 8) },
|
||||
cmake_dap_configuration = {
|
||||
name = "cpp",
|
||||
type = "codelldb",
|
||||
|
||||
@@ -1,45 +1,141 @@
|
||||
-- =============================================================================
|
||||
-- colorscheme.lua — 主题
|
||||
-- colorscheme.lua — tokyonight(UI 主题, 全透明) + VSCode Dark+ 代码配色覆盖
|
||||
-- =============================================================================
|
||||
|
||||
return {
|
||||
{
|
||||
"folke/tokyonight.nvim",
|
||||
lazy = false,
|
||||
priority = 1000,
|
||||
opts = {
|
||||
style = "night",
|
||||
transparent = true,
|
||||
styles = {
|
||||
sidebars = "transparent",
|
||||
floats = "transparent",
|
||||
},
|
||||
on_highlights = function(hl, c)
|
||||
-- bufferline 标签栏背景透明
|
||||
hl.BufferLineFill = { bg = "NONE" }
|
||||
hl.BufferLineBackGround = { bg = "NONE", fg = c.fg_gutter }
|
||||
hl.BufferLineBackGroundVisible = { bg = "NONE", fg = c.fg }
|
||||
hl.BufferLineBackGroundSelected = { bg = c.bg_highlight, fg = c.fg, bold = true }
|
||||
hl.BufferLineSeparator = { fg = c.fg_gutter }
|
||||
hl.BufferLineSeparatorSelected = { fg = c.blue }
|
||||
end,
|
||||
},
|
||||
config = function(_, opts)
|
||||
require("tokyonight").setup(opts)
|
||||
vim.cmd.colorscheme("tokyonight")
|
||||
{
|
||||
"folke/tokyonight.nvim",
|
||||
lazy = false,
|
||||
priority = 1000,
|
||||
opts = {
|
||||
style = "night",
|
||||
transparent = true,
|
||||
styles = {
|
||||
sidebars = "transparent",
|
||||
floats = "transparent", -- 浮动窗也透明(用户原本就是这个状态)
|
||||
},
|
||||
on_highlights = function(hl, c)
|
||||
-- bufferline 标签栏背景透明
|
||||
hl.BufferLineFill = { bg = "NONE" }
|
||||
hl.BufferLineBackGround = { bg = "NONE", fg = c.fg_gutter }
|
||||
hl.BufferLineBackGroundVisible = { bg = "NONE", fg = c.fg }
|
||||
hl.BufferLineBackGroundSelected = { bg = c.bg_highlight, fg = c.fg, bold = true }
|
||||
hl.BufferLineSeparator = { fg = c.fg_gutter }
|
||||
hl.BufferLineSeparatorSelected = { fg = c.blue }
|
||||
end,
|
||||
},
|
||||
config = function(_, opts)
|
||||
require("tokyonight").setup(opts)
|
||||
vim.cmd.colorscheme("tokyonight")
|
||||
|
||||
-- inlay hints 去掉背景
|
||||
vim.api.nvim_create_autocmd("ColorScheme", {
|
||||
pattern = "tokyonight",
|
||||
callback = function()
|
||||
vim.api.nvim_set_hl(0, "LspInlayHint", {
|
||||
bg = "NONE", fg = "#565f89", italic = true,
|
||||
})
|
||||
-- VSCode Dark+ 代码配色覆盖(只覆盖代码高亮组,UI/border/inlay hint 全走 tokyonight 默认)
|
||||
local vs = {
|
||||
variable = "#9CDCFE", -- 浅蓝
|
||||
builtin_var = "#569CD6", -- 蓝
|
||||
parameter = "#9CDCFE",
|
||||
field = "#9CDCFE",
|
||||
property = "#9CDCFE",
|
||||
func = "#DCDCAA", -- 浅黄
|
||||
builtin_fn = "#DCDCAA",
|
||||
method = "#DCDCAA",
|
||||
type = "#4EC9B0", -- teal
|
||||
builtin_type = "#4EC9B0",
|
||||
struct = "#4EC9B0",
|
||||
class = "#4EC9B0",
|
||||
enum = "#4EC9B0",
|
||||
constructor = "#4EC9B0",
|
||||
module = "#4EC9B0",
|
||||
constant = "#4FC1FF",
|
||||
builtin_const = "#569CD6",
|
||||
macro = "#B5CEA8",
|
||||
keyword = "#569CD6",
|
||||
keyword_ctrl = "#C586C0", -- pink(控制流)
|
||||
operator = "#D4D4D4", -- 灰白
|
||||
punctuation = "#D4D4D4",
|
||||
string = "#CE9178", -- 橙
|
||||
string_escape = "#D7BA7D",
|
||||
number = "#B5CEA8", -- 浅绿
|
||||
boolean = "#569CD6",
|
||||
comment = "#565f89", -- 灰绿
|
||||
}
|
||||
|
||||
local override = function()
|
||||
local set = function(name, spec)
|
||||
vim.api.nvim_set_hl(0, name, spec)
|
||||
end
|
||||
|
||||
-- treesitter
|
||||
set("@variable", { fg = vs.variable })
|
||||
set("@variable.builtin", { fg = vs.builtin_var })
|
||||
set("@variable.parameter", { fg = vs.parameter, italic = true })
|
||||
set("@variable.member", { fg = vs.field })
|
||||
set("@field", { fg = vs.field })
|
||||
set("@property", { fg = vs.property })
|
||||
set("@function", { fg = vs.func })
|
||||
set("@function.call", { fg = vs.func })
|
||||
set("@function.builtin", { fg = vs.builtin_fn })
|
||||
set("@method", { fg = vs.method })
|
||||
set("@method.call", { fg = vs.method })
|
||||
set("@constructor", { fg = vs.constructor })
|
||||
set("@type", { fg = vs.type })
|
||||
set("@type.builtin", { fg = vs.builtin_type })
|
||||
set("@type.definition", { fg = vs.type })
|
||||
set("@struct", { fg = vs.struct })
|
||||
set("@class", { fg = vs.class })
|
||||
set("@enum", { fg = vs.enum })
|
||||
set("@module", { fg = vs.module })
|
||||
set("@constant", { fg = vs.constant })
|
||||
set("@constant.builtin", { fg = vs.builtin_const })
|
||||
set("@macro", { fg = vs.macro })
|
||||
set("@keyword", { fg = vs.keyword })
|
||||
set("@keyword.function", { fg = vs.keyword_ctrl })
|
||||
set("@keyword.operator", { fg = vs.keyword })
|
||||
set("@keyword.return", { fg = vs.keyword_ctrl })
|
||||
set("@operator", { fg = vs.operator })
|
||||
set("@punctuation", { fg = vs.punctuation })
|
||||
set("@punctuation.bracket", { fg = vs.punctuation })
|
||||
set("@punctuation.delimiter", { fg = vs.punctuation })
|
||||
set("@punctuation.special", { fg = vs.string_escape })
|
||||
set("@string", { fg = vs.string })
|
||||
set("@string.escape", { fg = vs.string_escape })
|
||||
set("@string.special", { fg = vs.string_escape })
|
||||
set("@number", { fg = vs.number })
|
||||
set("@boolean", { fg = vs.boolean })
|
||||
set("@float", { fg = vs.number })
|
||||
set("@comment", { fg = vs.comment, italic = true })
|
||||
set("@tag", { fg = vs.keyword })
|
||||
set("@tag.attribute", { fg = vs.variable })
|
||||
set("@tag.delimiter", { fg = vs.punctuation })
|
||||
set("@attribute", { fg = vs.keyword })
|
||||
set("@label", { fg = vs.variable })
|
||||
|
||||
-- LSP semantic tokens (clangd / lua_ls 发送)
|
||||
set("@lsp.type.variable", { fg = vs.variable })
|
||||
set("@lsp.type.parameter", { fg = vs.parameter, italic = true })
|
||||
set("@lsp.type.property", { fg = vs.property })
|
||||
set("@lsp.type.function", { fg = vs.func })
|
||||
set("@lsp.type.method", { fg = vs.method })
|
||||
set("@lsp.type.class", { fg = vs.class })
|
||||
set("@lsp.type.struct", { fg = vs.struct })
|
||||
set("@lsp.type.enum", { fg = vs.enum })
|
||||
set("@lsp.type.enumMember", { fg = vs.constant })
|
||||
set("@lsp.type.constant", { fg = vs.constant })
|
||||
set("@lsp.type.field", { fg = vs.field })
|
||||
set("@lsp.type.typeParameter", { fg = vs.type })
|
||||
set("@lsp.mod.readonly", { fg = vs.constant })
|
||||
set("@lsp.typemod.variable.readonly", { fg = vs.constant })
|
||||
set("@lsp.typemod.variable.global", { fg = vs.constant })
|
||||
|
||||
-- inlay hint 透明背景 + 用户原来的紫灰色 #565f89
|
||||
set("LspInlayHint", { bg = "NONE", fg = "#565f89", italic = true })
|
||||
end
|
||||
|
||||
-- 切到 tokyonight 后立即覆盖,ColorScheme 事件再覆盖一次(防 lazy reload)
|
||||
vim.api.nvim_create_autocmd("ColorScheme", {
|
||||
pattern = "tokyonight",
|
||||
callback = override,
|
||||
})
|
||||
override()
|
||||
end,
|
||||
})
|
||||
vim.api.nvim_set_hl(0, "LspInlayHint", {
|
||||
bg = "NONE", fg = "#565f89", italic = true,
|
||||
})
|
||||
end,
|
||||
},
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
@@ -33,7 +33,10 @@ return {
|
||||
},
|
||||
formatters = {
|
||||
["clang-format"] = {
|
||||
args = { "--style={BasedOnStyle: LLVM, IndentWidth: 4, TabWidth: 4, UseTab: Never, ColumnLimit: 0}" },
|
||||
-- 用 prepend_args (不是 args!): 保留 conform 默认的 "-assume-filename $FILENAME".
|
||||
-- 若用 args 会覆盖默认值, 导致 clang-format 读 stdin 时丢失文件名 → 语言检测/样式查找出问题.
|
||||
-- 优先读项目 .clang-format 文件; 没有该文件时用此内联 4 空格样式兜底.
|
||||
prepend_args = { "--style={BasedOnStyle: LLVM, IndentWidth: 4, TabWidth: 4, UseTab: Never, ColumnLimit: 0}" },
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
@@ -25,6 +25,32 @@ return {
|
||||
},
|
||||
},
|
||||
|
||||
-- lspsaga: LSP UI 增强(hover 滚动、智能定位、诊断、重命名等)
|
||||
-- 替代手写 hover 滚动逻辑,自带 VSCode 风格滚动键 <C-d>/<C-u>/<C-f>/<C-b>
|
||||
{
|
||||
"nvimdev/lspsaga.nvim",
|
||||
event = "LspAttach",
|
||||
dependencies = {
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
"nvim-tree/nvim-web-devicons",
|
||||
},
|
||||
opts = {
|
||||
lightbulb = { enable = false },
|
||||
hover = {
|
||||
max_width = 0.6,
|
||||
max_height = 0.8,
|
||||
},
|
||||
ui = {
|
||||
border = "rounded",
|
||||
code_action = "bulb",
|
||||
},
|
||||
scroll_preview = {
|
||||
scroll_down = "<C-d>",
|
||||
scroll_up = "<C-u>",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
-- LSP 配置(Neovim 0.11+ vim.lsp.config API)
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
@@ -33,11 +59,12 @@ return {
|
||||
"williamboman/mason.nvim",
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
"saghen/blink.cmp",
|
||||
"nvimdev/lspsaga.nvim",
|
||||
},
|
||||
config = function()
|
||||
local caps = require("blink.cmp").get_lsp_capabilities()
|
||||
|
||||
-- LSP 附加时自动开启 inlay hints
|
||||
-- LSP 附加时绑定 keymap + 开 inlay hints
|
||||
vim.api.nvim_create_autocmd("LspAttach", {
|
||||
callback = function(args)
|
||||
local map = function(keys, func, desc)
|
||||
@@ -45,18 +72,27 @@ return {
|
||||
end
|
||||
map("gd", vim.lsp.buf.definition, "跳转到定义")
|
||||
map("gr", vim.lsp.buf.references, "查找引用")
|
||||
map("K", vim.lsp.buf.hover, "悬浮文档")
|
||||
map("<leader>rn", vim.lsp.buf.rename, "重命名")
|
||||
map("<M-CR>", vim.lsp.buf.code_action, "代码操作")
|
||||
map("<leader>d", vim.diagnostic.open_float, "行诊断")
|
||||
map("[d", vim.diagnostic.goto_prev, "上一个诊断")
|
||||
map("]d", vim.diagnostic.goto_next, "下一个诊断")
|
||||
map("K", "<cmd>Lspsaga hover_doc<CR>", "悬浮文档")
|
||||
map("<leader>rn", "<cmd>Lspsaga rename<CR>", "重命名")
|
||||
map("<M-CR>", "<cmd>Lspsaga code_action<CR>", "代码操作")
|
||||
map("<leader>d", "<cmd>Lspsaga show_line_diagnostics<CR>", "行诊断")
|
||||
map("[d", "<cmd>Lspsaga diagnostic_jump_prev<CR>", "上一个诊断")
|
||||
map("]d", "<cmd>Lspsaga diagnostic_jump_next<CR>", "下一个诊断")
|
||||
|
||||
-- 开启 inlay hints
|
||||
vim.lsp.inlay_hint.enable(true, { bufnr = args.buf })
|
||||
end,
|
||||
})
|
||||
|
||||
-- 诊断全局配置
|
||||
vim.diagnostic.config({
|
||||
virtual_text = false,
|
||||
signs = true,
|
||||
underline = true,
|
||||
update_in_insert = false,
|
||||
float = { border = "rounded" },
|
||||
})
|
||||
|
||||
-- Lua
|
||||
vim.lsp.config['lua_ls'] = {
|
||||
cmd = { 'lua-language-server' },
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
return {
|
||||
{
|
||||
"nvim-telescope/telescope.nvim",
|
||||
branch = "0.1.x",
|
||||
branch = "master", -- 0.1.x 没适配新 treesitter main 分支 API(ft_to_lang 已移除)
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
"nvim-telescope/telescope-ui-select.nvim",
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
return {
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
branch = "main", -- master 已被上游归档,main 是现行分支
|
||||
event = { "BufReadPre", "BufNewFile" },
|
||||
build = ":TSUpdate",
|
||||
opts = {
|
||||
|
||||
+19
-11
@@ -4,6 +4,14 @@
|
||||
|
||||
local M = {}
|
||||
|
||||
--- 获取 CPU 核心数,用于并行构建
|
||||
---@return integer
|
||||
local function cpu_count()
|
||||
local info = vim.loop.cpu_info()
|
||||
return info and #info or 8
|
||||
end
|
||||
local NPROC = tostring(cpu_count())
|
||||
|
||||
--- 检测当前项目类型
|
||||
---@return "rust"|"cmake"|"python"|"go"|"unknown"
|
||||
function M.detect()
|
||||
@@ -62,31 +70,31 @@ local function run_in_terminal(cmd, title)
|
||||
term:toggle()
|
||||
end
|
||||
|
||||
--- 构建(使用底部终端)
|
||||
--- 构建(使用底部终端,多核并行)
|
||||
function M.build()
|
||||
local project = M.detect()
|
||||
|
||||
if project == "rust" then
|
||||
run_in_terminal("cargo build", "Cargo Build")
|
||||
run_in_terminal("cargo build -j " .. NPROC, "Cargo Build")
|
||||
elseif project == "cmake" then
|
||||
vim.cmd("CMakeBuild")
|
||||
elseif project == "go" then
|
||||
run_in_terminal("go build ./...", "Go Build")
|
||||
run_in_terminal("go build -p " .. NPROC .. " ./...", "Go Build")
|
||||
else
|
||||
vim.notify("未识别的项目类型,无法自动构建", vim.log.levels.WARN)
|
||||
end
|
||||
end
|
||||
|
||||
--- 运行(使用底部终端)
|
||||
--- 运行(使用底部终端,编译阶段并行)
|
||||
function M.run()
|
||||
local project = M.detect()
|
||||
|
||||
if project == "rust" then
|
||||
run_in_terminal("cargo run", "Cargo Run")
|
||||
run_in_terminal("cargo run -j " .. NPROC, "Cargo Run")
|
||||
elseif project == "cmake" then
|
||||
vim.cmd("CMakeRun")
|
||||
elseif project == "go" then
|
||||
run_in_terminal("go run .", "Go Run")
|
||||
run_in_terminal("go run -p " .. NPROC .. " .", "Go Run")
|
||||
elseif project == "python" then
|
||||
run_in_terminal("python " .. vim.fn.expand("%"), "Python Run")
|
||||
else
|
||||
@@ -107,19 +115,19 @@ function M.debug()
|
||||
end
|
||||
end
|
||||
|
||||
--- 测试(使用底部终端)
|
||||
--- 测试(使用底部终端,并行执行)
|
||||
function M.test()
|
||||
local project = M.detect()
|
||||
|
||||
if project == "rust" then
|
||||
run_in_terminal("cargo test", "Cargo Test")
|
||||
run_in_terminal("cargo test -j " .. NPROC, "Cargo Test")
|
||||
elseif project == "cmake" then
|
||||
vim.cmd("CMakeBuild")
|
||||
run_in_terminal("ctest --test-dir build", "CTest")
|
||||
run_in_terminal("ctest --test-dir build -j " .. NPROC, "CTest")
|
||||
elseif project == "go" then
|
||||
run_in_terminal("go test ./...", "Go Test")
|
||||
run_in_terminal("go test -p " .. NPROC .. " ./...", "Go Test")
|
||||
elseif project == "python" then
|
||||
run_in_terminal("pytest", "Pytest")
|
||||
run_in_terminal("pytest -n " .. NPROC, "Pytest")
|
||||
else
|
||||
vim.notify("未识别的项目类型,无法自动测试", vim.log.levels.WARN)
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user