summaryrefslogtreecommitdiff
path: root/lua
diff options
context:
space:
mode:
authorChris <[email protected]>2021-03-29 10:59:18 -0400
committerChris <[email protected]>2021-03-29 10:59:18 -0400
commit30cf1c968626d521fd76ce258eaceaeea1920897 (patch)
tree8a4729c1dc4b9b1e551d02a3faef66e24771e556 /lua
parent7d74781eada41bc2777ddd1bd5dbdf53db12ef9f (diff)
update
Diffstat (limited to 'lua')
-rw-r--r--lua/nv-autopairs/init.lua14
-rw-r--r--lua/plugins.lua11
2 files changed, 14 insertions, 11 deletions
diff --git a/lua/nv-autopairs/init.lua b/lua/nv-autopairs/init.lua
index 0578786d..822eadd7 100644
--- a/lua/nv-autopairs/init.lua
+++ b/lua/nv-autopairs/init.lua
@@ -75,24 +75,26 @@ MUtils.completion_confirm = function()
end
end
-MUtils.tab = function()
- if vim.fn.pumvisible() ~= 0 then
+MUtils.tab=function()
+ if vim.fn.pumvisible() ~= 0 then
return npairs.esc("<C-n>")
else
if vim.fn["vsnip#available"](1) ~= 0 then
- return vim.fn.feedkeys(string.format('%c%c%c(vsnip-expand-or-jump)', 0x80, 253, 83))
+ vim.fn.feedkeys(string.format('%c%c%c(vsnip-expand-or-jump)', 0x80, 253, 83))
+ return npairs.esc("")
else
return npairs.esc("<Tab>")
end
end
end
-MUtils.s_tab = function()
- if vim.fn.pumvisible() ~= 0 then
+MUtils.s_tab=function()
+ if vim.fn.pumvisible() ~= 0 then
return npairs.esc("<C-p>")
else
if vim.fn["vsnip#jumpable"](-1) ~= 0 then
- return vim.fn.feedkeys(string.format('%c%c%c(vsnip-jump-prev)', 0x80, 253, 83))
+ vim.fn.feedkeys(string.format('%c%c%c(vsnip-jump-prev)', 0x80, 253, 83))
+ return npairs.esc("")
else
return npairs.esc("<C-h>")
end
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 2f18fe35..b00a78fd 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -40,6 +40,7 @@ return require('packer').startup(function(use)
use 'mattn/emmet-vim'
use 'hrsh7th/vim-vsnip'
use "rafamadriz/friendly-snippets"
+ use 'ChristianChiarulli/html-snippets'
-- Treesitter
use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'}
@@ -112,11 +113,8 @@ return require('packer').startup(function(use)
use 'monaqa/dial.nvim'
use 'junegunn/goyo.vim'
use 'andymass/vim-matchup'
- -- use 'cohama/lexima.vim'
use 'MattesGroeger/vim-bookmarks'
- -- use 'kshenoy/vim-signature'
- -- use 'nelstrom/vim-visual-star-search'
- -- TODO switch back when config support snips
+ use 'brooth/far.vim'
use 'windwp/nvim-autopairs'
-- TODO put this back when stable for indent lines
@@ -145,6 +143,9 @@ return require('packer').startup(function(use)
-- use 'dsznajder/vscode-es7-javascript-react-snippets'
-- use 'golang/vscode-go'
-- use 'rust-lang/vscode-rust'
- -- use 'ChristianChiarulli/html-snippets'
-- use 'ChristianChiarulli/python-snippets'
+ -- use 'kshenoy/vim-signature'
+ -- use 'nelstrom/vim-visual-star-search'
+ -- TODO switch back when config support snips
+ -- use 'cohama/lexima.vim'
end)