fixed json support
This commit is contained in:
parent
ac6a5d815b
commit
a993fc8313
File diff suppressed because it is too large
Load Diff
|
|
@ -1,2 +1,6 @@
|
||||||
vim.api.nvim_set_keymap("n", "<leader>f", "<CMD>Telescope find_files<CR>", {silent = true})
|
vim.api.nvim_set_keymap("n", "<leader>ff", "<cmd>lua require('telescope.builtin').find_files()<cr>", {silent = true})
|
||||||
|
vim.api.nvim_set_keymap("n", "<leader>fg", "<cmd>lua require('telescope.builtin').live_grep()<cr>", {silent = true})
|
||||||
|
vim.api.nvim_set_keymap("n", "<leader>fb", "<cmd>lua require('telescope.builtin').buffers()<cr>", {silent = true})
|
||||||
|
vim.api.nvim_set_keymap("n", "<leader>fh", "<cmd>lua require('telescope.builtin').help_tags()<cr>", {silent = true})
|
||||||
|
vim.api.nvim_set_keymap("n", "<leader>t", "<CMD>TodoTelescope<CR>", {silent = true})
|
||||||
vim.api.nvim_set_keymap("", "q:", "<Nop>", {silent = true})
|
vim.api.nvim_set_keymap("", "q:", "<Nop>", {silent = true})
|
||||||
|
|
|
||||||
|
|
@ -70,6 +70,21 @@ return require("packer").startup(
|
||||||
enable_check_bracket_line = true
|
enable_check_bracket_line = true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
local remap = vim.api.nvim_set_keymap
|
||||||
|
local npairs = require("nvim-autopairs")
|
||||||
|
|
||||||
|
-- skip it, if you use another global object
|
||||||
|
_G.MUtils = {}
|
||||||
|
|
||||||
|
MUtils.completion_confirm = function()
|
||||||
|
if vim.fn.pumvisible() ~= 0 then
|
||||||
|
return npairs.esc("<cr>")
|
||||||
|
else
|
||||||
|
return npairs.autopairs_cr()
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
remap("i", "<CR>", "v:lua.MUtils.completion_confirm()", {expr = true, noremap = true})
|
||||||
require "nvim-treesitter.configs".setup {
|
require "nvim-treesitter.configs".setup {
|
||||||
context_commentstring = {
|
context_commentstring = {
|
||||||
enable = true,
|
enable = true,
|
||||||
|
|
@ -112,7 +127,12 @@ return require("packer").startup(
|
||||||
config = function()
|
config = function()
|
||||||
require "plugins/lsp"
|
require "plugins/lsp"
|
||||||
end,
|
end,
|
||||||
requires = {"RishabhRD/nvim-lsputils", "onsails/lspkind-nvim"}
|
requires = {
|
||||||
|
"RishabhRD/nvim-lsputils",
|
||||||
|
"onsails/lspkind-nvim",
|
||||||
|
"ray-x/lsp_signature.nvim",
|
||||||
|
"jose-elias-alvarez/nvim-lsp-ts-utils"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
use {
|
use {
|
||||||
"hrsh7th/nvim-compe",
|
"hrsh7th/nvim-compe",
|
||||||
|
|
@ -122,6 +142,11 @@ return require("packer").startup(
|
||||||
}
|
}
|
||||||
use {
|
use {
|
||||||
"nvim-telescope/telescope.nvim",
|
"nvim-telescope/telescope.nvim",
|
||||||
|
config = function()
|
||||||
|
require("telescope").setup {
|
||||||
|
file_ignore_patterns = {"package-lock.json"}
|
||||||
|
}
|
||||||
|
end,
|
||||||
requires = {"nvim-lua/popup.nvim", "nvim-lua/plenary.nvim"}
|
requires = {"nvim-lua/popup.nvim", "nvim-lua/plenary.nvim"}
|
||||||
}
|
}
|
||||||
use {
|
use {
|
||||||
|
|
@ -149,12 +174,6 @@ return require("packer").startup(
|
||||||
end,
|
end,
|
||||||
requires = "kyazdani42/nvim-web-devicons"
|
requires = "kyazdani42/nvim-web-devicons"
|
||||||
}
|
}
|
||||||
use {
|
|
||||||
"lewis6991/spellsitter.nvim",
|
|
||||||
config = function()
|
|
||||||
require("spellsitter").setup()
|
|
||||||
end
|
|
||||||
}
|
|
||||||
use {
|
use {
|
||||||
"rcarriga/vim-ultest",
|
"rcarriga/vim-ultest",
|
||||||
config = function()
|
config = function()
|
||||||
|
|
@ -169,5 +188,13 @@ return require("packer").startup(
|
||||||
require("package-info").setup()
|
require("package-info").setup()
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
use {"npxbr/glow.nvim", run = "GlowInstall"}
|
||||||
|
use {
|
||||||
|
"folke/todo-comments.nvim",
|
||||||
|
requires = "nvim-lua/plenary.nvim",
|
||||||
|
config = function()
|
||||||
|
require("todo-comments").setup {}
|
||||||
|
end
|
||||||
|
}
|
||||||
end
|
end
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,177 @@
|
||||||
|
local execute = vim.api.nvim_command
|
||||||
|
local fn = vim.fn
|
||||||
|
-- ensure that packer is installed
|
||||||
|
local install_path = fn.stdpath("data") .. "/site/pack/packer/opt/packer.nvim"
|
||||||
|
if fn.empty(fn.glob(install_path)) > 0 then
|
||||||
|
end
|
||||||
|
vim.cmd("packadd packer.nvim")
|
||||||
|
local packer = require "packer"
|
||||||
|
|
||||||
|
packer.init(
|
||||||
|
{
|
||||||
|
package_root = util.join_paths(vim.fn.stdpath("data"), "site", "pack")
|
||||||
|
}
|
||||||
|
)
|
||||||
|
hello!
|
||||||
|
|
||||||
|
return require("packer").startup(
|
||||||
|
function()
|
||||||
|
-- Packer can manage itself
|
||||||
|
use "wbthomason/packer.nvim"
|
||||||
|
use {
|
||||||
|
"MasterGordon/monokai.nvim",
|
||||||
|
config = function()
|
||||||
|
require("monokai").setup()
|
||||||
|
end
|
||||||
|
}
|
||||||
|
use {
|
||||||
|
"glepnir/galaxyline.nvim",
|
||||||
|
branch = "main",
|
||||||
|
config = function()
|
||||||
|
require "plugins/galaxyline"
|
||||||
|
end,
|
||||||
|
requires = {"kyazdani42/nvim-web-devicons"}
|
||||||
|
}
|
||||||
|
use {
|
||||||
|
"kyazdani42/nvim-tree.lua",
|
||||||
|
config = function()
|
||||||
|
require "plugins/nvim-tree"
|
||||||
|
end,
|
||||||
|
requires = {"kyazdani42/nvim-web-devicons", opt = true}
|
||||||
|
}
|
||||||
|
use "JoosepAlviste/nvim-ts-context-commentstring"
|
||||||
|
use {
|
||||||
|
"b3nj5m1n/kommentary",
|
||||||
|
config = function()
|
||||||
|
require("kommentary.config").configure_language(
|
||||||
|
"typescriptreact",
|
||||||
|
{
|
||||||
|
single_line_comment_string = "auto",
|
||||||
|
multi_line_comment_strings = "auto",
|
||||||
|
hook_function = function()
|
||||||
|
require("ts_context_commentstring.internal").update_commentstring()
|
||||||
|
end
|
||||||
|
}
|
||||||
|
)
|
||||||
|
end
|
||||||
|
}
|
||||||
|
use {
|
||||||
|
"nvim-treesitter/playground",
|
||||||
|
requires = {"nvim-treesitter/nvim-treesitter"}
|
||||||
|
}
|
||||||
|
use {
|
||||||
|
"nvim-treesitter/nvim-treesitter",
|
||||||
|
run = ":TSUpdate",
|
||||||
|
config = function()
|
||||||
|
require("nvim-autopairs").setup(
|
||||||
|
{
|
||||||
|
enable_check_bracket_line = true
|
||||||
|
}
|
||||||
|
)
|
||||||
|
require "nvim-treesitter.configs".setup {
|
||||||
|
context_commentstring = {
|
||||||
|
enable = true,
|
||||||
|
enable_autocmd = true
|
||||||
|
},
|
||||||
|
highlight = {
|
||||||
|
enable = true,
|
||||||
|
custom_captures = {
|
||||||
|
["jsx_element"] = "TSTag"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
indent = {
|
||||||
|
enable = true
|
||||||
|
},
|
||||||
|
autotag = {
|
||||||
|
enable = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
end,
|
||||||
|
requires = {"JoosepAlviste/nvim-ts-context-commentstring", "windwp/nvim-ts-autotag", "windwp/nvim-autopairs"}
|
||||||
|
}
|
||||||
|
use {
|
||||||
|
"mhartington/formatter.nvim",
|
||||||
|
config = function()
|
||||||
|
require "plugins/formatter"
|
||||||
|
end
|
||||||
|
}
|
||||||
|
use {
|
||||||
|
"mhinz/vim-signify",
|
||||||
|
config = function()
|
||||||
|
require "plugins/signify"
|
||||||
|
end
|
||||||
|
}
|
||||||
|
use {
|
||||||
|
"RishabhRD/nvim-lsputils",
|
||||||
|
requires = {"RishabhRD/popfix"}
|
||||||
|
}
|
||||||
|
use {
|
||||||
|
"neovim/nvim-lspconfig",
|
||||||
|
config = function()
|
||||||
|
require "plugins/lsp"
|
||||||
|
end,
|
||||||
|
requires = {
|
||||||
|
"RishabhRD/nvim-lsputils",
|
||||||
|
"onsails/lspkind-nvim",
|
||||||
|
"ray-x/lsp_signature.nvim",
|
||||||
|
"jose-elias-alvarez/nvim-lsp-ts-utils"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
use {
|
||||||
|
"hrsh7th/nvim-compe",
|
||||||
|
config = function()
|
||||||
|
require "plugins/compe"
|
||||||
|
end
|
||||||
|
}
|
||||||
|
use {
|
||||||
|
"nvim-telescope/telescope.nvim",
|
||||||
|
requires = {"nvim-lua/popup.nvim", "nvim-lua/plenary.nvim"}
|
||||||
|
}
|
||||||
|
use {
|
||||||
|
"nacro90/numb.nvim",
|
||||||
|
config = function()
|
||||||
|
require("numb").setup()
|
||||||
|
end
|
||||||
|
}
|
||||||
|
use {
|
||||||
|
"norcalli/nvim-colorizer.lua",
|
||||||
|
config = function()
|
||||||
|
require "colorizer".setup()
|
||||||
|
end
|
||||||
|
}
|
||||||
|
use {
|
||||||
|
"sindrets/diffview.nvim",
|
||||||
|
config = function()
|
||||||
|
require "plugins/diffview"
|
||||||
|
end
|
||||||
|
}
|
||||||
|
use {
|
||||||
|
"akinsho/nvim-bufferline.lua",
|
||||||
|
config = function()
|
||||||
|
require "plugins/bufferline"
|
||||||
|
end,
|
||||||
|
requires = "kyazdani42/nvim-web-devicons"
|
||||||
|
}
|
||||||
|
use {
|
||||||
|
"lewis6991/spellsitter.nvim",
|
||||||
|
config = function()
|
||||||
|
require("spellsitter").setup()
|
||||||
|
end
|
||||||
|
}
|
||||||
|
use {
|
||||||
|
"rcarriga/vim-ultest",
|
||||||
|
config = function()
|
||||||
|
require "plugins/ultest"
|
||||||
|
end,
|
||||||
|
requires = {"vim-test/vim-test"},
|
||||||
|
run = ":UpdateRemotePlugins"
|
||||||
|
}
|
||||||
|
use {
|
||||||
|
"vuki656/package-info.nvim",
|
||||||
|
config = function()
|
||||||
|
require("package-info").setup()
|
||||||
|
end
|
||||||
|
}
|
||||||
|
use {"npxbr/glow.nvim", run = "GlowInstall"}
|
||||||
|
end
|
||||||
|
)
|
||||||
|
|
@ -15,9 +15,7 @@ require "compe".setup {
|
||||||
source = {
|
source = {
|
||||||
path = true,
|
path = true,
|
||||||
buffer = true,
|
buffer = true,
|
||||||
calc = true,
|
|
||||||
nvim_lsp = true,
|
nvim_lsp = true,
|
||||||
nvim_lua = true,
|
|
||||||
vsnip = false
|
vsnip = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,6 @@ require "lspconfig".ccls.setup {}
|
||||||
require "lspconfig".clangd.setup {}
|
require "lspconfig".clangd.setup {}
|
||||||
require "lspconfig".cssls.setup {}
|
require "lspconfig".cssls.setup {}
|
||||||
require "lspconfig".html.setup {}
|
require "lspconfig".html.setup {}
|
||||||
require "lspconfig".jsonls.setup {}
|
|
||||||
require "lspconfig".pyright.setup {}
|
require "lspconfig".pyright.setup {}
|
||||||
require "lspconfig".tsserver.setup {}
|
require "lspconfig".tsserver.setup {}
|
||||||
require "lspconfig".vimls.setup {}
|
require "lspconfig".vimls.setup {}
|
||||||
|
|
@ -71,6 +70,11 @@ require "lspconfig".efm.setup {
|
||||||
local nvim_lsp = require("lspconfig")
|
local nvim_lsp = require("lspconfig")
|
||||||
|
|
||||||
local on_attach = function(client, bufnr)
|
local on_attach = function(client, bufnr)
|
||||||
|
require "lsp_signature".on_attach(
|
||||||
|
{
|
||||||
|
hint_enable = false
|
||||||
|
}
|
||||||
|
)
|
||||||
local function buf_set_keymap(...)
|
local function buf_set_keymap(...)
|
||||||
vim.api.nvim_buf_set_keymap(bufnr, ...)
|
vim.api.nvim_buf_set_keymap(bufnr, ...)
|
||||||
end
|
end
|
||||||
|
|
@ -98,7 +102,30 @@ local on_attach = function(client, bufnr)
|
||||||
buf_set_keymap("n", "<space>q", "<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>", opts)
|
buf_set_keymap("n", "<space>q", "<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>", opts)
|
||||||
end
|
end
|
||||||
|
|
||||||
local servers = {"pyright", "jsonls", "tsserver", "bashls", "clangd", "cssls"}
|
require "lspconfig".jsonls.setup {
|
||||||
|
on_attach = on_attach,
|
||||||
|
flags = {
|
||||||
|
debounce_text_changes = 150
|
||||||
|
},
|
||||||
|
settings = {
|
||||||
|
json = require "json-schema"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
require "lspconfig".tsserver.setup {
|
||||||
|
on_attach = function(client, bufnr)
|
||||||
|
local ts_utils = require("nvim-lsp-ts-utils")
|
||||||
|
|
||||||
|
ts_utils.setup {}
|
||||||
|
ts_utils.setup_client(client)
|
||||||
|
on_attach(client, bufnr)
|
||||||
|
end,
|
||||||
|
flags = {
|
||||||
|
debounce_text_changes = 150
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
local servers = {"pyright", "bashls", "clangd", "cssls"}
|
||||||
for _, lsp in ipairs(servers) do
|
for _, lsp in ipairs(servers) do
|
||||||
nvim_lsp[lsp].setup {
|
nvim_lsp[lsp].setup {
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
|
|
|
||||||
1
setup.sh
1
setup.sh
|
|
@ -9,4 +9,5 @@ vim-language-server \
|
||||||
vscode-css-languageserver-bin \
|
vscode-css-languageserver-bin \
|
||||||
vscode-html-languageserver-bin \
|
vscode-html-languageserver-bin \
|
||||||
vscode-json-languageserver \
|
vscode-json-languageserver \
|
||||||
|
vscode-langservers-extracted \
|
||||||
vscode-langservers-extracted
|
vscode-langservers-extracted
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue