mirror of
https://github.com/pojokcodeid/nvim-lazy.git
synced 2025-07-16 04:14:29 +02:00
Merge branch 'v2'
This commit is contained in:
commit
d9f7dd2533
15 changed files with 730 additions and 539 deletions
|
@ -10,7 +10,7 @@ local rfile = {
|
|||
typescript = "ts-node $dir/$fileName", -- npm install -g ts-node
|
||||
rust = "cd $dir && rustc $fileName && $dir/$fileNameWithoutExt",
|
||||
-- cpp="gcc $fileName -lstdc++ -o $fileNameWithoutExt && $fileNameWithoutExt"
|
||||
cpp = "g++ $fileName -o $fileNameWithoutExt && $dir/$fileNameWithoutExt",
|
||||
cpp = "cd $dir && g++ $fileName -o $fileNameWithoutExt && $dir/$fileNameWithoutExt",
|
||||
scss = "sass $dir/$fileName $dir/$fileNameWithoutExt.css",
|
||||
javascript = 'node "$dir/$fileName"',
|
||||
}
|
||||
|
|
|
@ -19,11 +19,6 @@ M.capabilities = cmp_nvim_lsp.default_capabilities(M.capabilities)
|
|||
|
||||
M.setup = function()
|
||||
local signs = {
|
||||
|
||||
-- { name = "DiagnosticSignError", text = "" },
|
||||
-- { name = "DiagnosticSignWarn", text = "" },
|
||||
-- { name = "DiagnosticSignHint", text = "" },
|
||||
-- { name = "DiagnosticSignInfo", text = "" },
|
||||
{ name = "DiagnosticSignError", text = icons.diagnostics.Error },
|
||||
{ name = "DiagnosticSignWarn", text = icons.diagnostics.Warning },
|
||||
{ name = "DiagnosticSignHint", text = icons.diagnostics.Hint },
|
||||
|
@ -97,12 +92,13 @@ M.on_attach = function(client, bufnr)
|
|||
client.server_capabilities.documentFormattingProvider = false
|
||||
end
|
||||
|
||||
if client.name == "sumneko_lua" then
|
||||
if client.name == "lua_ls" then
|
||||
client.server_capabilities.documentFormattingProvider = false
|
||||
end
|
||||
|
||||
if client.supports_method("textDocument/inlayHint") then
|
||||
vim.lsp.inlay_hint.enable(bufnr, true)
|
||||
-- vim.lsp.inlay_hint.enable(bufnr, true)
|
||||
vim.lsp.inlay_hint.enable(true)
|
||||
end
|
||||
|
||||
lsp_keymaps(bufnr)
|
||||
|
|
|
@ -28,11 +28,16 @@ configs.setup({
|
|||
-- json = "",
|
||||
-- },
|
||||
-- },
|
||||
-- rainbow = {
|
||||
-- enable = true,
|
||||
-- disable = { "html", "tsx" },
|
||||
-- equery = "rainbow-parens",
|
||||
-- strategy = require("ts-rainbow").strategy.global,
|
||||
-- },
|
||||
rainbow = {
|
||||
enable = true,
|
||||
disable = { "html", "tsx" },
|
||||
equery = "rainbow-parens",
|
||||
strategy = require("ts-rainbow").strategy.global,
|
||||
enable = false,
|
||||
extended_mode = true, -- Highlight also non-parentheses delimiters, boolean or table: lang -> boolean
|
||||
max_file_lines = 1000, -- Do not enable for files with more than 1000 lines, int
|
||||
},
|
||||
-- autotag = { enable = true, enable_rename = true, enable_close = true, enable_close_on_slash = true },
|
||||
incremental_selection = { enable = true },
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue