diff --git a/lua/lsp/json.lua b/lua/lsp/json.lua new file mode 100644 index 0000000..a6cd7dd --- /dev/null +++ b/lua/lsp/json.lua @@ -0,0 +1,4 @@ +return { + on_attach = function() + end +} diff --git a/lua/options.lua b/lua/options.lua index f255d8c..3227312 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -56,6 +56,13 @@ G.au({ "InsertEnter" }, { end, }) +G.au({ "VimEnter" }, { + pattern = { "*.code-snippets" }, + callback = function() + G.cmd("setfiletype json") + end, +}) + -- G.au({ -- {"CmdlineEnter"}, -- { diff --git a/lua/plugs/nvim-lspconfig.lua b/lua/plugs/nvim-lspconfig.lua index 7c77a62..ca253b5 100644 --- a/lua/plugs/nvim-lspconfig.lua +++ b/lua/plugs/nvim-lspconfig.lua @@ -14,7 +14,7 @@ return { require 'lspconfig'.pyright.setup(require('lsp.pyright')) require 'lspconfig'.yamlls.setup(require('lsp.yaml')) require 'lspconfig'.gopls.setup(require('lsp.go')) - require 'lspconfig'.jsonls.setup {} + require 'lspconfig'.jsonls.setup(require('lsp.json')) G.map({ @@ -139,7 +139,7 @@ return { 'onsails/lspkind-nvim', }, config = function() - G.g.vsnip_snippet_dir = G.fn.stdpath("config") .. "/sinppets/" + G.g.vsnip_snippet_dir = G.fn.stdpath("config") .. "/sinppets/acm/" local has_words_before = function() unpack = unpack or table.unpack local line, col = unpack(G.api.nvim_win_get_cursor(0))