diff --git a/lua/lsp/setup.lua b/lua/lsp/setup.lua index 0d47e22..4205125 100644 --- a/lua/lsp/setup.lua +++ b/lua/lsp/setup.lua @@ -53,7 +53,6 @@ require("mason-lspconfig").setup_handlers({ local keyOpts = { noremap = true, silent = true } -- vim.api.nvim_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc') vim.api.nvim_set_keymap('n', '', 'lua vim.lsp.buf.definition()', keyOpts) -vim.api.nvim_set_keymap('n', 'f', 'lua vim.lsp.buf.formatting()', keyOpts) vim.api.nvim_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', keyOpts) vim.api.nvim_set_keymap('n', 'e[', 'lua vim.diagnostic.goto_prev()', keyOpts) vim.api.nvim_set_keymap('n', 'e]', 'lua vim.diagnostic.goto_next()', keyOpts) @@ -124,15 +123,15 @@ require("formatter").setup { log_level = vim.log.levels.WARN, -- All formatter configurations are opt-in filetype = { - -- vue = { - -- function() - -- return { - -- exe = "prettierd", - -- args = {vim.api.nvim_buf_get_name(0)}, - -- stdin = true - -- } - -- end - -- }, + vue = { + function() + return { + exe = "prettierd", + args = {vim.api.nvim_buf_get_name(0)}, + stdin = true + } + end + }, -- Use the special "*" filetype for defining formatter configurations on -- any filetype diff --git a/maps.vim b/maps.vim index 49f2b9f..bfa9cc8 100644 --- a/maps.vim +++ b/maps.vim @@ -72,6 +72,9 @@ nnoremap :NvimTreeToggle nnoremap sf Telescope find_files nnoremap sw Telescope live_grep +nnoremap f :Format +nnoremap F :FormatWrite + " 禁用f1 " map map :ToggleTerm