Feat: moving forward but no completion yep

This commit is contained in:
Bertrand Benjamin 2021-09-16 22:54:40 +02:00
parent bd11e06a19
commit 23ba611075
5 changed files with 127 additions and 88 deletions

View File

@ -2,4 +2,4 @@ require('plugins')
require('settings') require('settings')
require('mappings') require('mappings')
-- require('lualine') require('lsp')

View File

@ -1,78 +0,0 @@
-- Configuration for nvim-compe
local utils = require('utils')
vim.cmd [[set shortmess+=c]]
utils.opt('o', 'completeopt', 'menuone,noselect')
require'compe'.setup {
enabled = true;
autocomplete = true;
debug = false;
min_length = 1;
preselect = 'enable';
throttle_time = 80;
source_timeout = 200;
incomplete_delay = 400;
allow_prefix_unmatch = false;
max_abbr_width = 1000;
max_kind_width = 1000;
max_menu_width = 1000000;
documentation = true;
source = {
path = true;
buffer = true;
calc = false;
vsnip = true;
nvim_lsp = true;
nvim_lua = false;
spell = true;
tags = true;
snippets_nvim = false;
treesitter = true;
};
}
local t = function(str)
return vim.api.nvim_replace_termcodes(str, true, true, true)
end
local check_back_space = function()
local col = vim.fn.col('.') - 1
if col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') then
return true
else
return false
end
end
-- Use (s-)tab to:
--- move to prev/next item in completion menuone
--- jump to prev/next snippet's placeholder
_G.tab_complete = function()
if vim.fn.pumvisible() == 1 then
return t "<C-n>"
elseif vim.fn.call("vsnip#available", {1}) == 1 then
return t "<Plug>(vsnip-expand-or-jump)"
elseif check_back_space() then
return t "<Tab>"
else
return vim.fn['compe#complete']()
end
end
_G.s_tab_complete = function()
if vim.fn.pumvisible() == 1 then
return t "<C-p>"
elseif vim.fn.call("vsnip#jumpable", {-1}) == 1 then
return t "<Plug>(vsnip-jump-prev)"
else
return t "<S-Tab>"
end
end
utils.map("i", "<Tab>", "v:lua.tab_complete()", {expr = true})
utils.map("s", "<Tab>", "v:lua.tab_complete()", {expr = true})
utils.map("i", "<S-Tab>", "v:lua.s_tab_complete()", {expr = true})
utils.map("s", "<S-Tab>", "v:lua.s_tab_complete()", {expr = true})

View File

@ -0,0 +1,98 @@
local has_words_before = function()
if vim.api.nvim_buf_get_option(0, "buftype") == "prompt" then
return false
end
local line, col = unpack(vim.api.nvim_win_get_cursor(0))
return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
end
local feedkey = function(key, mode)
vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(key, true, true, true), mode, true)
end
local lsp_symbols = {
Text = "  (Text) ",
Method = "  (Method)",
Function = "  (Function)",
Constructor = "  (Constructor)",
Field = " ﴲ (Field)",
Variable = "[] (Variable)",
Class = "  (Class)",
Interface = " ﰮ (Interface)",
Module = "  (Module)",
Property = " 襁 (Property)",
Unit = "  (Unit)",
Value = "  (Value)",
Enum = " 練 (Enum)",
Keyword = "  (Keyword)",
Snippet = "  (Snippet)",
Color = "  (Color)",
File = "  (File)",
Reference = "  (Reference)",
Folder = "  (Folder)",
EnumMember = "  (EnumMember)",
Constant = " ﲀ (Constant)",
Struct = " ﳤ (Struct)",
Event = "  (Event)",
Operator = "  (Operator)",
TypeParameter = "  (TypeParameter)",
}
local cmp = require'cmp'
cmp.setup{
completion = {
completeopt = "menuone,noinsert,noselect",
},
formatting = {
format = function(entry, vim_item)
-- fancy icons and a name of kind
vim_item.kind = lsp_symbols[vim_item.kind]
-- set a name for each source
vim_item.menu = ({
buffer = "[Buffer]",
nvim_lsp = "[LSP]",
vsnip = "[vSnip]",
path = "[Path]",
spell = "[Spell]",
})[entry.source.name]
return vim_item
end,
},
snippet = {
expand = function(args)
vim.fn["vsnip#anonymous"](args.body)
end,
},
mapping = {
-- ["<cr>"] = cmp.mapping.confirm({select = true, behavior = cmp.ConfirmBehavior.Replace}),
["<cr>"] = cmp.mapping.confirm({select = true, behavior = cmp.ConfirmBehavior.Insert}),
["<Tab>"] = cmp.mapping(function(fallback)
if vim.fn.pumvisible() == 1 then
feedkey("<C-n>", "n")
elseif vim.fn["vsnip#available"]() == 1 then
feedkey("<Plug>(vsnip-expand-or-jump)", "")
elseif has_words_before() then
cmp.complete()
else
fallback() -- The fallback function sends a already mapped key. In this case, it's probably `<Tab>`.
end
end, { "i", "s" }),
["<S-Tab>"] = cmp.mapping(function()
if vim.fn.pumvisible() == 1 then
feedkey("<C-p>", "n")
elseif vim.fn["vsnip#jumpable"](-1) == 1 then
feedkey("<Plug>(vsnip-jump-prev)", "")
end
end, { "i", "s" }),
},
source = {
{ name = 'buffer' },
{ name = 'vsnip' },
{ name = 'path' },
{ name = 'spell' },
}
}
vim.cmd [[autocmd FileType TelescopePrompt lua require('cmp').setup.buffer { enabled = false }]]
vim.g.vsnip_snippet_dir = '~/.config/nvim/vsnips'

View File

@ -1,3 +1,6 @@
-- Only required if you have packer configured as `opt`
vim.cmd [[packadd packer.nvim]]
return require('packer').startup(function() return require('packer').startup(function()
use 'morhetz/gruvbox' use 'morhetz/gruvbox'
@ -46,20 +49,37 @@ return require('packer').startup(function()
use 'tpope/vim-repeat' use 'tpope/vim-repeat'
use 'neovim/nvim-lspconfig' use 'neovim/nvim-lspconfig'
use 'hrsh7th/nvim-compe' use {
use 'hrsh7th/vim-vsnip' "hrsh7th/nvim-cmp",
use 'hrsh7th/vim-vsnip-integ' event = 'InsertEnter',
use 'rafamadriz/friendly-snippets' config = [[require('completion')]],
requires = {
-- 'hrsh7th/vim-vsnip-integ',
'rafamadriz/friendly-snippets',
},
}
use {"hrsh7th/vim-vsnip", after = "nvim-cmp"}
use {"hrsh7th/cmp-vsnip", after = "nvim-cmp"}
use {"hrsh7th/cmp-buffer", after = "nvim-cmp"}
use {'hrsh7th/cmp-path', after = "nvim-cmp"}
use {"hrsh7th/cmp-nvim-lsp", after = "nvim-cmp"}
use {'f3fora/cmp-spell', after = "nvim-cmp"}
use 'nvim-lua/popup.nvim' use 'nvim-lua/popup.nvim'
use 'nvim-lua/plenary.nvim' use {
use 'nvim-telescope/telescope.nvim' 'nvim-telescope/telescope.nvim',
requires = { {'nvim-lua/plenary.nvim'} }
}
use 'lervag/vimtex' use {
'lervag/vimtex',
}
-- Highlight on Yank -- Highlight on Yank
use 'machakann/vim-highlightedyank' use 'machakann/vim-highlightedyank'
-- Autoclose parenthesis -- Autoclose parenthesis
use 'jiangmiao/auto-pairs' use 'jiangmiao/auto-pairs'
use 'kyazdani42/nvim-web-devicons'
end) end)

View File

@ -26,8 +26,7 @@ opt.cursorline = true -- highlight current line
opt.ignorecase = true -- Ignore case on search opt.ignorecase = true -- Ignore case on search
opt.smartcase = true -- ignore lowercse for the whoel pattern opt.smartcase = true -- ignore lowercse for the whoel pattern
opt.completeopt = 'menuone,noselect,noinsert' -- completion options -- opt.completeopt = 'menu,noselect,noinsert' -- completion options
opt.shortmess = 'c' -- don't show completion messages
opt.spell = true opt.spell = true
opt.spelllang = {'fr', 'en'} opt.spelllang = {'fr', 'en'}