1
0
Fork 0

Compare commits

...

4 commits

4 changed files with 13 additions and 8 deletions

8
.gitmodules vendored
View file

@ -49,7 +49,7 @@
[submodule "pack/general/start/LuaSnip"] [submodule "pack/general/start/LuaSnip"]
path = pack/general/start/LuaSnip path = pack/general/start/LuaSnip
url = https://github.com/L3MON4D3/LuaSnip url = https://github.com/L3MON4D3/LuaSnip
[submodule "pack/general/start/cmd_luasnip"] [submodule "pack/general/start/cmp_luasnip"]
path = pack/general/start/cmp_luasnip path = pack/general/start/cmp_luasnip
url = https://github.com/saadparwaiz1/cmp_luasnip url = https://github.com/saadparwaiz1/cmp_luasnip
[submodule "pack/general/start/cmp-buffer"] [submodule "pack/general/start/cmp-buffer"]
@ -58,9 +58,6 @@
[submodule "pack/general/start/cmp-nvim-lsp"] [submodule "pack/general/start/cmp-nvim-lsp"]
path = pack/general/start/cmp-nvim-lsp path = pack/general/start/cmp-nvim-lsp
url = https://github.com/hrsh7th/cmp-nvim-lsp url = https://github.com/hrsh7th/cmp-nvim-lsp
[submodule "pack/general/start/friendly-snippets"]
path = pack/general/start/friendly-snippets
url = https://github.com/rafamadriz/friendly-snippets
[submodule "pack/general/start/Comment.nvim"] [submodule "pack/general/start/Comment.nvim"]
path = pack/general/start/Comment.nvim path = pack/general/start/Comment.nvim
url = https://github.com/numToStr/Comment.nvim url = https://github.com/numToStr/Comment.nvim
@ -85,3 +82,6 @@
[submodule "pack/general/start/nvim-lint"] [submodule "pack/general/start/nvim-lint"]
path = pack/general/start/nvim-lint path = pack/general/start/nvim-lint
url = https://github.com/mfussenegger/nvim-lint url = https://github.com/mfussenegger/nvim-lint
[submodule "pack/general/start/LuaSnip-snippets.nvim"]
path = pack/general/start/LuaSnip-snippets.nvim
url = https://github.com/molleweide/LuaSnip-snippets.nvim

View file

@ -139,6 +139,7 @@ end
-- map buffer local keybindings when the language server attaches -- map buffer local keybindings when the language server attaches
local servers = { local servers = {
clangd = {}, clangd = {},
eslint = {},
gopls = {}, gopls = {},
jsonls = {}, jsonls = {},
kotlin_language_server = {}, kotlin_language_server = {},
@ -179,7 +180,7 @@ lint.linters.clippy = {
stdin = false, stdin = false,
append_fname = true, append_fname = true,
args = {}, args = {},
stream = nil, -- ('stdout' | 'stderr' | 'both') configure the stream to which the linter outputs the linting result. stream = 'stdout',
ignore_exitcode = false, ignore_exitcode = false,
env = nil, env = nil,
parser = require('lint.parser').from_errorformat(clippy_format) parser = require('lint.parser').from_errorformat(clippy_format)
@ -191,7 +192,6 @@ linters = {
python = {'flake8'}, python = {'flake8'},
rust = {'clippy'}, rust = {'clippy'},
yaml = {'yamllint'}, yaml = {'yamllint'},
zsh = {'shellcheck'},
} }
-- set linters -- -- set linters --
lint.linters_by_ft = linters lint.linters_by_ft = linters
@ -243,7 +243,12 @@ for ft, ft_linters in pairs(linters) do
) )
end end
end end
---- LuaSnip
require('luasnip.loaders.from_lua').lazy_load()
cmd [[imap <silent><expr> <Tab> luasnip#expand_or_jumpable() ? '<Plug>luasnip-expand-or-jump' : '<Tab>']]
cmd [[inoremap <silent> <S-Tab> <cmd>lua require'luasnip'.jump(-1)<Cr>]]
cmd [[snoremap <silent> <Tab> <cmd>lua require('luasnip').jump(1)<Cr>]]
cmd [[snoremap <silent> <S-Tab> <cmd>lua require('luasnip').jump(-1)<Cr>]]
---- completion-nvim ---- completion-nvim
local cmp = require'cmp' local cmp = require'cmp'

@ -0,0 +1 @@
Subproject commit d7e40e4cce622eab2316607dbcd8d6039bcb9fe0

@ -1 +0,0 @@
Subproject commit 8d91ba2dc2421a54981115f61b914974f938fa77