fixed auto pair
This commit is contained in:
parent
9f3dc94b88
commit
6b9d409af9
|
|
@ -65,26 +65,22 @@ return require("packer").startup(
|
||||||
"nvim-treesitter/nvim-treesitter",
|
"nvim-treesitter/nvim-treesitter",
|
||||||
run = ":TSUpdate",
|
run = ":TSUpdate",
|
||||||
config = function()
|
config = function()
|
||||||
require("nvim-autopairs").setup(
|
local npairs = require("nvim-autopairs")
|
||||||
|
npairs.setup(
|
||||||
{
|
{
|
||||||
|
check_ts = true,
|
||||||
enable_check_bracket_line = true
|
enable_check_bracket_line = true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
local remap = vim.api.nvim_set_keymap
|
|
||||||
local npairs = require("nvim-autopairs")
|
|
||||||
|
|
||||||
-- skip it, if you use another global object
|
require("nvim-autopairs.completion.compe").setup(
|
||||||
_G.MUtils = {}
|
{
|
||||||
|
map_cr = true, -- map <CR> on insert mode
|
||||||
|
map_complete = true, -- it will auto insert `(` after select function or method item
|
||||||
|
auto_select = false -- auto select first item
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
MUtils.completion_confirm = function()
|
|
||||||
if vim.fn.pumvisible() ~= 0 then
|
|
||||||
return npairs.esc("<cr>")
|
|
||||||
else
|
|
||||||
return npairs.autopairs_cr()
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
remap("i", "<CR>", "v:lua.MUtils.completion_confirm()", {expr = true, noremap = true})
|
|
||||||
require "nvim-treesitter.configs".setup {
|
require "nvim-treesitter.configs".setup {
|
||||||
context_commentstring = {
|
context_commentstring = {
|
||||||
enable = true,
|
enable = true,
|
||||||
|
|
@ -101,7 +97,8 @@ return require("packer").startup(
|
||||||
},
|
},
|
||||||
autotag = {
|
autotag = {
|
||||||
enable = true
|
enable = true
|
||||||
}
|
},
|
||||||
|
autopairs = {enable = true}
|
||||||
}
|
}
|
||||||
end,
|
end,
|
||||||
requires = {"JoosepAlviste/nvim-ts-context-commentstring", "windwp/nvim-ts-autotag", "windwp/nvim-autopairs"}
|
requires = {"JoosepAlviste/nvim-ts-context-commentstring", "windwp/nvim-ts-autotag", "windwp/nvim-autopairs"}
|
||||||
|
|
@ -131,7 +128,8 @@ return require("packer").startup(
|
||||||
"RishabhRD/nvim-lsputils",
|
"RishabhRD/nvim-lsputils",
|
||||||
"onsails/lspkind-nvim",
|
"onsails/lspkind-nvim",
|
||||||
"ray-x/lsp_signature.nvim",
|
"ray-x/lsp_signature.nvim",
|
||||||
"jose-elias-alvarez/nvim-lsp-ts-utils"
|
"jose-elias-alvarez/nvim-lsp-ts-utils",
|
||||||
|
"jose-elias-alvarez/null-ls.nvim"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
use {
|
use {
|
||||||
|
|
|
||||||
|
|
@ -50,6 +50,10 @@ local eslint = {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
--- ESLINT Actions
|
||||||
|
require("null-ls").config {}
|
||||||
|
require("lspconfig")["null-ls"].setup {}
|
||||||
|
|
||||||
require "lspconfig".efm.setup {
|
require "lspconfig".efm.setup {
|
||||||
init_options = {documentFormatting = true},
|
init_options = {documentFormatting = true},
|
||||||
filetypes = {"javascript", "typescript", "javascriptreact", "typescriptreact"},
|
filetypes = {"javascript", "typescript", "javascriptreact", "typescriptreact"},
|
||||||
|
|
@ -111,7 +115,10 @@ require "lspconfig".tsserver.setup {
|
||||||
on_attach = function(client, bufnr)
|
on_attach = function(client, bufnr)
|
||||||
local ts_utils = require("nvim-lsp-ts-utils")
|
local ts_utils = require("nvim-lsp-ts-utils")
|
||||||
|
|
||||||
ts_utils.setup {}
|
ts_utils.setup {
|
||||||
|
eslint_bin = "eslint_d",
|
||||||
|
eslint_enable_diagnostics = false
|
||||||
|
}
|
||||||
ts_utils.setup_client(client)
|
ts_utils.setup_client(client)
|
||||||
on_attach(client, bufnr)
|
on_attach(client, bufnr)
|
||||||
end,
|
end,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue