I guess tab works again?

This commit is contained in:
Daniel Flanagan 2022-04-05 09:59:12 -05:00
parent 3991914f16
commit 2a7e660f61
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
3 changed files with 18 additions and 7 deletions

View file

@ -63,9 +63,6 @@
-c 'silent execute \"normal gg2dd\"' \ -c 'silent execute \"normal gg2dd\"' \
-c 'silent setlocal nobuflisted buftype=nofile bufhidden=wipe noswapfile' -c 'silent setlocal nobuflisted buftype=nofile bufhidden=wipe noswapfile'
[url "git@git-p1ap1.divvy.co:"]
insteadOf = https://git-p1ap1.divvy.co
[gpg] [gpg]
program = gpg2 program = gpg2

View file

@ -93,8 +93,11 @@ packer.startup(function()
i = cmp.mapping.abort(), i = cmp.mapping.abort(),
c = cmp.mapping.close(), c = cmp.mapping.close(),
}, },
['<Tab>'] = cmp.config.disable,
['<S-Tab>'] = cmp.config.disable,
['<CR>'] = cmp.mapping.confirm{select = true}, -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. ['<CR>'] = cmp.mapping.confirm{select = true}, -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
["<Tab>"] = cmp.mapping(function(fallback) --[[ ["<Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then if cmp.visible() then
cmp.select_next_item() cmp.select_next_item()
elseif luasnip.expand_or_jumpable() then elseif luasnip.expand_or_jumpable() then
@ -102,7 +105,7 @@ packer.startup(function()
elseif has_words_before() then elseif has_words_before() then
cmp.complete() cmp.complete()
else else
-- fallback() fallback()
end end
end, { "i", "s" }), end, { "i", "s" }),
["<S-Tab>"] = cmp.mapping(function(fallback) ["<S-Tab>"] = cmp.mapping(function(fallback)
@ -111,9 +114,10 @@ packer.startup(function()
elseif luasnip.jumpable(-1) then elseif luasnip.jumpable(-1) then
luasnip.jump(-1) luasnip.jump(-1)
else else
-- fallback() fallback()
end end
end, { "i", "s" }), end, { "i", "s" }),
]]--
}, },
sources = cmp.config.sources({ sources = cmp.config.sources({
{ name = 'nvim_lsp' }, { name = 'nvim_lsp' },

View file

@ -69,8 +69,18 @@ local status_line_buffers = function()
end end
end end
local whitespace = function()
local result = ""
if vim.o.expandtab == true then
result = result .. vim.o.shiftwidth .. "S"
else
result = result .. vim.o.tabstop .. "T"
end
return result
end
function StatusLine() function StatusLine()
return status_line_buffers() .. '%*%=%c,%l/%L (%p%%)' return status_line_buffers() .. '%*%=%{&filetype} %l;%c (%p%%/%L) ' .. whitespace()
end end
vim.o.statusline = '%!v:lua.StatusLine()' vim.o.statusline = '%!v:lua.StatusLine()'