mirror of
https://github.com/LunarVim/LunarVim.git
synced 2024-09-21 02:55:09 +02:00
more lazyload
This commit is contained in:
parent
c0a48c186b
commit
be87f71c20
2 changed files with 22 additions and 25 deletions
|
@ -1,7 +1,6 @@
|
||||||
-- if not package.loaded['nvim-autopairs'] then
|
-- if not package.loaded['nvim-autopairs'] then
|
||||||
-- return
|
-- return
|
||||||
-- end
|
-- end
|
||||||
|
|
||||||
local npairs = require('nvim-autopairs')
|
local npairs = require('nvim-autopairs')
|
||||||
local Rule = require('nvim-autopairs.rule')
|
local Rule = require('nvim-autopairs.rule')
|
||||||
|
|
||||||
|
@ -21,31 +20,28 @@ MUtils.completion_confirm=function()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if package.loaded['compe'] then
|
||||||
require("nvim-autopairs.completion.compe").setup({
|
require("nvim-autopairs.completion.compe").setup({
|
||||||
map_cr = true, -- map <CR> on insert mode
|
map_cr = true, -- map <CR> on insert mode
|
||||||
map_complete = true -- it will auto insert `(` after select function or method item
|
map_complete = true -- it will auto insert `(` after select function or method item
|
||||||
})
|
})
|
||||||
|
end
|
||||||
|
|
||||||
npairs.setup({
|
npairs.setup({
|
||||||
check_ts = true,
|
check_ts = true,
|
||||||
ts_config = {
|
ts_config = {
|
||||||
lua = {'string'}, -- it will not add pair on that treesitter node
|
lua = {'string'}, -- it will not add pair on that treesitter node
|
||||||
javascript = {'template_string'},
|
javascript = {'template_string'},
|
||||||
java = false,-- don't check treesitter on java
|
java = false -- don't check treesitter on java
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
require('nvim-treesitter.configs').setup {
|
require('nvim-treesitter.configs').setup {autopairs = {enable = true}}
|
||||||
autopairs = {enable = true}
|
|
||||||
}
|
|
||||||
|
|
||||||
local ts_conds = require('nvim-autopairs.ts-conds')
|
local ts_conds = require('nvim-autopairs.ts-conds')
|
||||||
|
|
||||||
-- press % => %% is only inside comment or string
|
-- press % => %% is only inside comment or string
|
||||||
npairs.add_rules({
|
npairs.add_rules({
|
||||||
Rule("%", "%", "lua")
|
Rule("%", "%", "lua"):with_pair(ts_conds.is_ts_node({'string', 'comment'})),
|
||||||
:with_pair(ts_conds.is_ts_node({'string','comment'})),
|
Rule("$", "$", "lua"):with_pair(ts_conds.is_not_ts_node({'function'}))
|
||||||
Rule("$", "$", "lua")
|
|
||||||
:with_pair(ts_conds.is_not_ts_node({'function'}))
|
|
||||||
})
|
})
|
||||||
|
|
|
@ -90,8 +90,9 @@ return require("packer").startup(function(use)
|
||||||
|
|
||||||
-- Autopairs
|
-- Autopairs
|
||||||
use {
|
use {
|
||||||
-- event = "InsertEnter",
|
|
||||||
"windwp/nvim-autopairs",
|
"windwp/nvim-autopairs",
|
||||||
|
event = "InsertEnter",
|
||||||
|
after = {"telescope.nvim", "nvim-compe"},
|
||||||
config = function()
|
config = function()
|
||||||
require 'lv-autopairs'
|
require 'lv-autopairs'
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue