chore: format lua

This commit is contained in:
Young Xu 2023-05-06 00:17:07 +08:00
parent 3391a6d60a
commit 06d2d1ed02
Signed by: xuthus5
GPG Key ID: A23CF9620CBB55F9
10 changed files with 66 additions and 68 deletions

View File

@ -30,9 +30,9 @@ map.set("n", "<C-j>", "<C-w>j", noreopt)
map.set("n", "<C-k>", "<C-w>k", noreopt) map.set("n", "<C-k>", "<C-w>k", noreopt)
map.set("n", "<C-l>", "<C-w>l", noreopt) map.set("n", "<C-l>", "<C-w>l", noreopt)
-- 折叠配置 -- 折叠配置
map.set({"n", "v"}, "<leader>z+", "zM", noreopt) map.set({ "n", "v" }, "<leader>z+", "zM", noreopt)
map.set({"n", "v"}, "<leader>z-", "zR", noreopt) map.set({ "n", "v" }, "<leader>z-", "zR", noreopt)
map.set({"n", "v"}, "<leader>zz", "za", noreopt) map.set({ "n", "v" }, "<leader>zz", "za", noreopt)
-- 分屏 -- 分屏
map.set("n", "<leader>sv", ":vsp<CR>", noreopt) map.set("n", "<leader>sv", ":vsp<CR>", noreopt)
map.set("n", "<leader>sh", ":sp<CR>", noreopt) map.set("n", "<leader>sh", ":sp<CR>", noreopt)

View File

@ -1 +1 @@
vim.cmd([[colorscheme tokyonight-storm]]) -- vim.cmd([[colorscheme tokyonight-storm]])

View File

@ -4,15 +4,15 @@ local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities.textDocument.completion.completionItem.snippetSupport = true capabilities.textDocument.completion.completionItem.snippetSupport = true
require("lspconfig").html.setup({ require("lspconfig").html.setup({
capabilities = capabilities, capabilities = capabilities,
}) })
require("lspconfig").cssls.setup({ require("lspconfig").cssls.setup({
capabilities = capabilities, capabilities = capabilities,
}) })
require("lspconfig").tsserver.setup({ require("lspconfig").tsserver.setup({
capabilities = capabilities, capabilities = capabilities,
}) })
-- require("lspconfig").eslint.setup({ -- require("lspconfig").eslint.setup({

View File

@ -46,13 +46,13 @@ cmp.setup({
local capabilities = require("cmp_nvim_lsp").default_capabilities() --nvim-cmp local capabilities = require("cmp_nvim_lsp").default_capabilities() --nvim-cmp
require("lspconfig")["golangci_lint_ls"].setup({ require("lspconfig").golangci_lint_ls.setup({
on_attach = common_lsp_on_attach, on_attach = common_lsp_on_attach,
flags = common_lsp_flags, flags = common_lsp_flags,
}) })
util = require("lspconfig/util") util = require("lspconfig/util")
require("lspconfig")["gopls"].setup({ require("lspconfig").gopls.setup({
cmd = { "gopls" }, cmd = { "gopls" },
filetypes = { "go", "gomod" }, filetypes = { "go", "gomod" },
root_dir = util.root_pattern("go.work", "go.mod", ".git"), root_dir = util.root_pattern("go.work", "go.mod", ".git"),
@ -71,4 +71,3 @@ require("lspconfig")["gopls"].setup({
}, },
init_options = { usePlaceholders = true }, init_options = { usePlaceholders = true },
}) })

View File

@ -1,14 +1,14 @@
-- Use an on_attach function to only map the following keys -- Use an on_attach function to only map the following keys
-- after the language server attaches to the current buffer -- after the language server attaches to the current buffer
common_lsp_on_attach = function(client, bufnr) common_lsp_on_attach = function(client, bufnr)
local function buf_set_keymap(...) local function buf_set_keymap(...)
vim.api.nvim_buf_set_keymap(bufnr, ...) vim.api.nvim_buf_set_keymap(bufnr, ...)
end end
local function buf_set_option(...) local function buf_set_option(...)
vim.api.nvim_buf_set_option(bufnr, ...) vim.api.nvim_buf_set_option(bufnr, ...)
end end
end end
common_lsp_flags = { common_lsp_flags = {
debounce_text_changes = 500, debounce_text_changes = 500,
} }

View File

@ -1,3 +1,3 @@
require("lspconfig").volar.setup({ require("lspconfig").volar.setup({
filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue", "json" }, filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue", "json" },
}) })

View File

@ -9,7 +9,7 @@ function IsFileExist(filename)
end end
function IsWindows() function IsWindows()
local delimeter = package.config.sub(1, 1) local delimeter = package.config:sub(1, 1)
if delimeter == "/" then if delimeter == "/" then
return false return false
end end

View File

@ -1,43 +1,43 @@
require("nvim-treesitter.configs").setup({ require("nvim-treesitter.configs").setup({
-- A list of parser names, or "all" (the four listed parsers should always be installed) -- A list of parser names, or "all" (the four listed parsers should always be installed)
ensure_installed = { ensure_installed = {
"bash", "bash",
"c", "c",
"css", "css",
"dart", "dart",
"diff", "diff",
"dockerfile", "dockerfile",
"git_rebase", "git_rebase",
"gitattributes", "gitattributes",
"gitcommit", "gitcommit",
"gitignore", "gitignore",
"go", "go",
"gomod", "gomod",
"gosum", "gosum",
"gowork", "gowork",
"html", "html",
"java", "java",
"javascript", "javascript",
"json", "json",
"lua", "lua",
"markdown", "markdown",
"rust", "rust",
"toml", "toml",
"typescript", "typescript",
"vim", "vim",
"vue", "vue",
"yaml", "yaml",
"proto", "proto",
}, },
-- Install parsers synchronously (only applied to `ensure_installed`) -- Install parsers synchronously (only applied to `ensure_installed`)
sync_install = true, sync_install = true,
-- Automatically install missing parsers when entering buffer -- Automatically install missing parsers when entering buffer
-- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
auto_install = true, auto_install = true,
-- List of parsers to ignore installing (for "all") -- List of parsers to ignore installing (for "all")
ignore_install = {}, ignore_install = {},
---- If you need to change the installation directory of the parsers (see -> Advanced Setup) ---- If you need to change the installation directory of the parsers (see -> Advanced Setup)
-- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")! -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")!
incremental_selection = { incremental_selection = {
enable = true, enable = true,
@ -48,14 +48,14 @@ require("nvim-treesitter.configs").setup({
scope_incremental = "<TAB>", scope_incremental = "<TAB>",
}, },
}, },
indent = { indent = {
enable = true, enable = true,
}, },
highlight = { highlight = {
enable = true, enable = true,
additional_vim_regex_highlighting = false, additional_vim_regex_highlighting = false,
}, },
autotag = { autotag = {
enable = true, enable = true,
}, },
}) })

View File

View File

@ -49,4 +49,3 @@ G.map({
{ "c", "<up>", [[wilder#in_context() ? wilder#previous() : '<up>']], { noremap = true, expr = true } }, { "c", "<up>", [[wilder#in_context() ? wilder#previous() : '<up>']], { noremap = true, expr = true } },
{ "c", "0", "0", {} }, -- 不清楚原因导致0无法使用 强制覆盖 { "c", "0", "0", {} }, -- 不清楚原因导致0无法使用 强制覆盖
}) })