diff options
| author | Chris <[email protected]> | 2021-03-15 11:54:53 -0400 |
|---|---|---|
| committer | Chris <[email protected]> | 2021-03-15 11:54:53 -0400 |
| commit | dae005f87f91b5ce150629f86f5f376a1f90f253 (patch) | |
| tree | 868c8da424139fcceb7ead54278a9780b7cad749 /lua | |
| parent | 516c505d2b0741ab9dce6f700c6523256a156574 (diff) | |
updates
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/keymappings.lua | 2 | ||||
| -rw-r--r-- | lua/lsp/js-ts-ls.lua | 9 | ||||
| -rw-r--r-- | lua/nv-compe/init.lua | 2 | ||||
| -rw-r--r-- | lua/plugins.lua | 4 |
4 files changed, 16 insertions, 1 deletions
diff --git a/lua/keymappings.lua b/lua/keymappings.lua index fe910de5..b5a57924 100644 --- a/lua/keymappings.lua +++ b/lua/keymappings.lua @@ -59,6 +59,8 @@ vim.api.nvim_set_keymap('x', 'J', ':move \'>+1<CR>gv-gv', { noremap = true, sile -- Better nav for omnicomplete vim.cmd('inoremap <expr> <c-j> (\"\\<C-n>\")') vim.cmd('inoremap <expr> <c-k> (\"\\<C-p>\")') +-- vim.cmd('inoremap <expr> <TAB> (\"\\<C-n>\")') +-- vim.cmd('inoremap <expr> <S-TAB> (\"\\<C-p>\")') -- TAB Complete --vim.api.nvim_set_keymap('i', '<expr><TAB>', 'pumvisible() ? \"\\<C-n>\" : \"\\<TAB>\"', { noremap = true, silent = true }) diff --git a/lua/lsp/js-ts-ls.lua b/lua/lsp/js-ts-ls.lua index 9d35fcbf..a1276d6d 100644 --- a/lua/lsp/js-ts-ls.lua +++ b/lua/lsp/js-ts-ls.lua @@ -1,2 +1,9 @@ -- npm install -g typescript typescript-language-server -require'lspconfig'.tsserver.setup{} +require'snippets'.use_suggested_mappings() + +local capabilities = vim.lsp.protocol.make_client_capabilities() +capabilities.textDocument.completion.completionItem.snippetSupport = true; +require'lspconfig'.tsserver.setup{ + capabilities = capabilities, + on_attach = on_attach +} diff --git a/lua/nv-compe/init.lua b/lua/nv-compe/init.lua index 4dcfe26a..75fa9b55 100644 --- a/lua/nv-compe/init.lua +++ b/lua/nv-compe/init.lua @@ -1,3 +1,5 @@ +vim.o.completeopt = "menuone,noselect" + require'compe'.setup { enabled = true; autocomplete = true; diff --git a/lua/plugins.lua b/lua/plugins.lua index 2bd457ca..d54a59db 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -33,6 +33,10 @@ return require('packer').startup(function() -- Autocomplete use 'hrsh7th/nvim-compe' use 'hrsh7th/vim-vsnip' + use 'honza/vim-snippets' + use 'norcalli/snippets.nvim' + + -- use 'SirVer/ultisnips' -- Treesitter use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' } |