From 6fddfcb743fe2f4980608853ef27fb9b5737a3ee Mon Sep 17 00:00:00 2001 From: christianchiarulli Date: Tue, 14 Dec 2021 18:25:42 -0500 Subject: add null-ls fix bufferline f --- lua/user/lsp/init.lua | 5 +++-- lua/user/lsp/null-ls.lua | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 lua/user/lsp/null-ls.lua (limited to 'lua/user/lsp') diff --git a/lua/user/lsp/init.lua b/lua/user/lsp/init.lua index a62e7aa..8158cf3 100644 --- a/lua/user/lsp/init.lua +++ b/lua/user/lsp/init.lua @@ -1,7 +1,8 @@ local status_ok, _ = pcall(require, "lspconfig") if not status_ok then - return + return end -require("user.lsp.lsp-installer") +require "user.lsp.lsp-installer" require("user.lsp.handlers").setup() +require "user.lsp.null-ls" diff --git a/lua/user/lsp/null-ls.lua b/lua/user/lsp/null-ls.lua new file mode 100644 index 0000000..874e19c --- /dev/null +++ b/lua/user/lsp/null-ls.lua @@ -0,0 +1,19 @@ +local null_ls_status_ok, null_ls = pcall(require, "null-ls") +if not null_ls_status_ok then + return +end + +-- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/formatting +local formatting = null_ls.builtins.formatting +-- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics +local diagnostics = null_ls.builtins.diagnostics + +null_ls.setup({ + debug = false, + sources = { + formatting.prettier.with({ extra_args = { "--no-semi", "--single-quote", "--jsx-single-quote" } }), + formatting.black.with({ extra_args = { "--fast" } }), + formatting.stylua, + -- diagnostics.flake8 + }, +}) -- cgit v1.2.3 From 0981b2838275468ad1863aba908379af63209e7a Mon Sep 17 00:00:00 2001 From: christianchiarulli Date: Mon, 20 Dec 2021 23:27:38 -0500 Subject: lsp updates --- init.lua | 1 + lua/user/cmp.lua | 2 ++ lua/user/lsp/lsp-installer.lua | 5 +++++ lua/user/lsp/settings/jsonls.lua | 18 ++---------------- lua/user/lsp/settings/pyright.lua | 10 ++++++++++ lua/user/plugins.lua | 2 +- 6 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 lua/user/lsp/settings/pyright.lua (limited to 'lua/user/lsp') diff --git a/init.lua b/init.lua index 8a515b8..dd4c62b 100644 --- a/init.lua +++ b/init.lua @@ -4,3 +4,4 @@ require "user.plugins" require "user.colorscheme" require "user.cmp" require "user.lsp" + diff --git a/lua/user/cmp.lua b/lua/user/cmp.lua index a151214..0ba1fc7 100644 --- a/lua/user/cmp.lua +++ b/lua/user/cmp.lua @@ -102,6 +102,7 @@ cmp.setup { -- vim_item.kind = string.format('%s %s', kind_icons[vim_item.kind], vim_item.kind) -- This concatonates the icons with the name of the item kind vim_item.menu = ({ nvim_lsp = "[LSP]", + nvim_lua = "[NVIM_LUA]", luasnip = "[Snippet]", buffer = "[Buffer]", path = "[Path]", @@ -111,6 +112,7 @@ cmp.setup { }, sources = { { name = "nvim_lsp" }, + { name = "nvim_lua" }, { name = "luasnip" }, { name = "buffer" }, { name = "path" }, diff --git a/lua/user/lsp/lsp-installer.lua b/lua/user/lsp/lsp-installer.lua index 2fe4af2..f539050 100644 --- a/lua/user/lsp/lsp-installer.lua +++ b/lua/user/lsp/lsp-installer.lua @@ -21,6 +21,11 @@ lsp_installer.on_server_ready(function(server) opts = vim.tbl_deep_extend("force", sumneko_opts, opts) end + if server.name == "pyright" then + local pyright_opts = require("user.lsp.settings.pyright") + opts = vim.tbl_deep_extend("force", pyright_opts, opts) + end + -- This setup() function is exactly the same as lspconfig's setup function. -- Refer to https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md server:setup(opts) diff --git a/lua/user/lsp/settings/jsonls.lua b/lua/user/lsp/settings/jsonls.lua index 1fffa68..be362c9 100644 --- a/lua/user/lsp/settings/jsonls.lua +++ b/lua/user/lsp/settings/jsonls.lua @@ -1,9 +1,4 @@ -local default_schemas = nil -local status_ok, jsonls_settings = pcall(require, "nlspsettings.jsonls") -if status_ok then - default_schemas = jsonls_settings.get_default_schemas() -end - +-- Find more schemas here: https://www.schemastore.org/json/ local schemas = { { description = "TypeScript compiler configuration file", @@ -168,19 +163,10 @@ local schemas = { }, } -local function extend(tab1, tab2) - for _, value in ipairs(tab2) do - table.insert(tab1, value) - end - return tab1 -end - -local extended_schemas = extend(schemas, default_schemas) - local opts = { settings = { json = { - schemas = extended_schemas, + schemas = schemas, }, }, setup = { diff --git a/lua/user/lsp/settings/pyright.lua b/lua/user/lsp/settings/pyright.lua new file mode 100644 index 0000000..6354274 --- /dev/null +++ b/lua/user/lsp/settings/pyright.lua @@ -0,0 +1,10 @@ +return { + settings = { + + python = { + analysis = { + typeCheckingMode = "off" + } + } + }, +} diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua index 45141e2..17dd7b5 100644 --- a/lua/user/plugins.lua +++ b/lua/user/plugins.lua @@ -56,6 +56,7 @@ return packer.startup(function(use) use "hrsh7th/cmp-cmdline" -- cmdline completions use "saadparwaiz1/cmp_luasnip" -- snippet completions use "hrsh7th/cmp-nvim-lsp" + use "hrsh7th/cmp-nvim-lua" -- snippets use "L3MON4D3/LuaSnip" --snippet engine @@ -64,7 +65,6 @@ return packer.startup(function(use) -- LSP use "neovim/nvim-lspconfig" -- enable LSP use "williamboman/nvim-lsp-installer" -- simple to use language server installer - use "tamago324/nlsp-settings.nvim" -- language server settings defined in json for -- Automatically set up your configuration after cloning packer.nvim -- Put this at the end after all plugins -- cgit v1.2.3 From efd287ffa01e611a0981b34e70538528e5e96fdb Mon Sep 17 00:00:00 2001 From: christianchiarulli Date: Sun, 2 Jan 2022 14:27:12 -0500 Subject: update deprecated diagnostic show --- lua/user/lsp/handlers.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua/user/lsp') diff --git a/lua/user/lsp/handlers.lua b/lua/user/lsp/handlers.lua index fb8b7f8..5dfde9b 100644 --- a/lua/user/lsp/handlers.lua +++ b/lua/user/lsp/handlers.lua @@ -76,7 +76,7 @@ local function lsp_keymaps(bufnr) bufnr, "n", "gl", - 'lua vim.lsp.diagnostic.show_line_diagnostics({ border = "rounded" })', + 'lua vim.diagnostic.open_float()', opts ) vim.api.nvim_buf_set_keymap(bufnr, "n", "]d", 'lua vim.diagnostic.goto_next({ border = "rounded" })', opts) -- cgit v1.2.3 From 65466d0b009251f5dfc745abfac9540f2b597eb8 Mon Sep 17 00:00:00 2001 From: christianchiarulli Date: Sun, 2 Jan 2022 14:37:51 -0500 Subject: diagnostic flake8 enabled by default --- lua/user/lsp/null-ls.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua/user/lsp') diff --git a/lua/user/lsp/null-ls.lua b/lua/user/lsp/null-ls.lua index 874e19c..c7d40fd 100644 --- a/lua/user/lsp/null-ls.lua +++ b/lua/user/lsp/null-ls.lua @@ -14,6 +14,6 @@ null_ls.setup({ formatting.prettier.with({ extra_args = { "--no-semi", "--single-quote", "--jsx-single-quote" } }), formatting.black.with({ extra_args = { "--fast" } }), formatting.stylua, - -- diagnostics.flake8 + diagnostics.flake8 }, }) -- cgit v1.2.3 From 8309138032f1bcd6eeb9586994994696f4786204 Mon Sep 17 00:00:00 2001 From: christianchiarulli Date: Sun, 2 Jan 2022 15:13:39 -0500 Subject: updates for video --- lua/user/keymaps.lua | 1 + lua/user/lsp/handlers.lua | 8 +------- lua/user/lsp/null-ls.lua | 21 +++++++++++---------- 3 files changed, 13 insertions(+), 17 deletions(-) (limited to 'lua/user/lsp') diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua index 638cab5..6140fbd 100644 --- a/lua/user/keymaps.lua +++ b/lua/user/keymaps.lua @@ -69,3 +69,4 @@ keymap("t", "", "l", term_opts) -- Nvimtree keymap("n", "e", ":NvimTreeToggle", opts) +keymap("n", "f", ":Format", opts) diff --git a/lua/user/lsp/handlers.lua b/lua/user/lsp/handlers.lua index 5dfde9b..4868b79 100644 --- a/lua/user/lsp/handlers.lua +++ b/lua/user/lsp/handlers.lua @@ -72,13 +72,7 @@ local function lsp_keymaps(bufnr) -- vim.api.nvim_buf_set_keymap(bufnr, "n", "ca", "lua vim.lsp.buf.code_action()", opts) -- vim.api.nvim_buf_set_keymap(bufnr, "n", "f", "lua vim.diagnostic.open_float()", opts) vim.api.nvim_buf_set_keymap(bufnr, "n", "[d", 'lua vim.diagnostic.goto_prev({ border = "rounded" })', opts) - vim.api.nvim_buf_set_keymap( - bufnr, - "n", - "gl", - 'lua vim.diagnostic.open_float()', - opts - ) + vim.api.nvim_buf_set_keymap(bufnr, "n", "gl", "lua vim.diagnostic.open_float()", opts) vim.api.nvim_buf_set_keymap(bufnr, "n", "]d", 'lua vim.diagnostic.goto_next({ border = "rounded" })', opts) vim.api.nvim_buf_set_keymap(bufnr, "n", "q", "lua vim.diagnostic.setloclist()", opts) vim.cmd [[ command! Format execute 'lua vim.lsp.buf.formatting()' ]] diff --git a/lua/user/lsp/null-ls.lua b/lua/user/lsp/null-ls.lua index c7d40fd..ec79994 100644 --- a/lua/user/lsp/null-ls.lua +++ b/lua/user/lsp/null-ls.lua @@ -1,6 +1,6 @@ local null_ls_status_ok, null_ls = pcall(require, "null-ls") if not null_ls_status_ok then - return + return end -- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/formatting @@ -8,12 +8,13 @@ local formatting = null_ls.builtins.formatting -- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics local diagnostics = null_ls.builtins.diagnostics -null_ls.setup({ - debug = false, - sources = { - formatting.prettier.with({ extra_args = { "--no-semi", "--single-quote", "--jsx-single-quote" } }), - formatting.black.with({ extra_args = { "--fast" } }), - formatting.stylua, - diagnostics.flake8 - }, -}) +null_ls.setup { + debug = false, + sources = { + formatting.prettier.with { extra_args = { "--no-semi", "--single-quote", "--jsx-single-quote" } }, + formatting.black.with { extra_args = { "--fast" } }, + -- formatting.yapf, + formatting.stylua, + diagnostics.flake8, + }, +} -- cgit v1.2.3