This commit is contained in:
Chris 2021-03-29 10:59:18 -04:00
parent 7d74781ead
commit 30cf1c9686
2 changed files with 14 additions and 11 deletions

View file

@ -80,7 +80,8 @@ MUtils.tab = function()
return npairs.esc("<C-n>") return npairs.esc("<C-n>")
else else
if vim.fn["vsnip#available"](1) ~= 0 then 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 else
return npairs.esc("<Tab>") return npairs.esc("<Tab>")
end end
@ -92,7 +93,8 @@ MUtils.s_tab = function()
return npairs.esc("<C-p>") return npairs.esc("<C-p>")
else else
if vim.fn["vsnip#jumpable"](-1) ~= 0 then 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 else
return npairs.esc("<C-h>") return npairs.esc("<C-h>")
end end

View file

@ -40,6 +40,7 @@ return require('packer').startup(function(use)
use 'mattn/emmet-vim' use 'mattn/emmet-vim'
use 'hrsh7th/vim-vsnip' use 'hrsh7th/vim-vsnip'
use "rafamadriz/friendly-snippets" use "rafamadriz/friendly-snippets"
use 'ChristianChiarulli/html-snippets'
-- Treesitter -- Treesitter
use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'} use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'}
@ -112,11 +113,8 @@ return require('packer').startup(function(use)
use 'monaqa/dial.nvim' use 'monaqa/dial.nvim'
use 'junegunn/goyo.vim' use 'junegunn/goyo.vim'
use 'andymass/vim-matchup' use 'andymass/vim-matchup'
-- use 'cohama/lexima.vim'
use 'MattesGroeger/vim-bookmarks' use 'MattesGroeger/vim-bookmarks'
-- use 'kshenoy/vim-signature' use 'brooth/far.vim'
-- use 'nelstrom/vim-visual-star-search'
-- TODO switch back when config support snips
use 'windwp/nvim-autopairs' use 'windwp/nvim-autopairs'
-- TODO put this back when stable for indent lines -- 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 'dsznajder/vscode-es7-javascript-react-snippets'
-- use 'golang/vscode-go' -- use 'golang/vscode-go'
-- use 'rust-lang/vscode-rust' -- use 'rust-lang/vscode-rust'
-- use 'ChristianChiarulli/html-snippets'
-- use 'ChristianChiarulli/python-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) end)