minor updates sync

This commit is contained in:
Solomon Laing 2023-12-04 09:24:09 +10:30
parent c2a74cff58
commit 8de69d02bd
6 changed files with 337 additions and 337 deletions

View File

@ -7,7 +7,7 @@ return {
"hrsh7th/cmp-path", "hrsh7th/cmp-path",
"hrsh7th/cmp-emoji", "hrsh7th/cmp-emoji",
"hrsh7th/cmp-buffer", "hrsh7th/cmp-buffer",
"saadparwaiz1/cmp_luasnip", -- "saadparwaiz1/cmp_luasnip",
{ {
"zbirenbaum/copilot-cmp", "zbirenbaum/copilot-cmp",
dependencies = "copilot.lua", dependencies = "copilot.lua",
@ -31,11 +31,11 @@ return {
completion = { completion = {
completeopt = "menu,menuone,noinsert", completeopt = "menu,menuone,noinsert",
}, },
snippet = { -- snippet = {
expand = function(args) -- expand = function(args)
require("luasnip").lsp_expand(args.body) -- require("luasnip").lsp_expand(args.body)
end, -- end,
}, -- },
mapping = cmp.mapping.preset.insert({ mapping = cmp.mapping.preset.insert({
["<C-b>"] = cmp.mapping.scroll_docs(-4), ["<C-b>"] = cmp.mapping.scroll_docs(-4),
["<C-f>"] = cmp.mapping.scroll_docs(4), ["<C-f>"] = cmp.mapping.scroll_docs(4),
@ -47,7 +47,7 @@ return {
}), }),
sources = cmp.config.sources({ sources = cmp.config.sources({
{ name = "nvim_lsp" }, { name = "nvim_lsp" },
{ name = "luasnip" }, -- { name = "luasnip" },
{ name = "path" }, { name = "path" },
{ name = "emoji" }, { name = "emoji" },
{ name = "buffer" }, { name = "buffer" },

View File

@ -20,7 +20,8 @@ return {
opts = { opts = {
hooks = { hooks = {
pre = function() pre = function()
require("ts_context_commentstring.internal").update_commentstring({}) require('ts_context_commentstring').setup {}
vim.g.skip_ts_context_commentstring_module = true
end, end,
}, },
}, },

View File

@ -45,8 +45,8 @@ function M.disable_others_when_zk(client)
end end
function M.on_attach(client, bufnr) function M.on_attach(client, bufnr)
M.disable_deno_formatting(client) -- M.disable_deno_formatting(client)
M.resolve_tsserver_deno(client) -- M.resolve_tsserver_deno(client)
M.disable_others_when_zk(client) M.disable_others_when_zk(client)
end end

View File

@ -1,21 +1,21 @@
return { return {
{ -- {
"L3MON4D3/LuaSnip", -- "L3MON4D3/LuaSnip",
dependencies = { -- dependencies = {
"rafamadriz/friendly-snippets", -- "rafamadriz/friendly-snippets",
config = function() -- config = function()
require("luasnip.loaders.from_vscode").lazy_load() -- require("luasnip.loaders.from_vscode").lazy_load()
end, -- end,
}, -- },
opts = { -- opts = {
history = true, -- history = true,
delete_check_events = "TextChanged", -- delete_check_events = "TextChanged",
}, -- },
-- stylua: ignore -- -- stylua: ignore
keys = { -- keys = {
{ "<tab>", function() return require("luasnip").jumpable(1) and "<Plug>luasnip-jump-next" or "<tab>" end, expr = true, silent = true, mode = "i", }, -- { "<tab>", function() return require("luasnip").jumpable(1) and "<Plug>luasnip-jump-next" or "<tab>" end, expr = true, silent = true, mode = "i", },
{ "<tab>", function() require("luasnip").jump(1) end, mode = "s", }, -- { "<tab>", function() require("luasnip").jump(1) end, mode = "s", },
{ "<s-tab>", function() require("luasnip").jump(-1) end, mode = { "i", "s" }, }, -- { "<s-tab>", function() require("luasnip").jump(-1) end, mode = { "i", "s" }, },
}, -- },
}, -- },
} }

View File

@ -13,7 +13,6 @@ return {
}, },
autopairs = { enable = true }, autopairs = { enable = true },
indent = { enable = true }, indent = { enable = true },
context_commentstring = { enable = true, enable_autocmd = false },
ensure_installed = { ensure_installed = {
"c_sharp", "c_sharp",
"lua", "lua",