From 68102b50d2abd612b85fbcf37bc7e88f5e5c1d10 Mon Sep 17 00:00:00 2001 From: gogamid <36050790+gogamid@users.noreply.github.com> Date: Fri, 1 Nov 2024 16:33:49 +0100 Subject: [PATCH 1/6] feat(buf): new lsp for protobuf --- lua/lspconfig/configs/buflsp.lua | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 lua/lspconfig/configs/buflsp.lua diff --git a/lua/lspconfig/configs/buflsp.lua b/lua/lspconfig/configs/buflsp.lua new file mode 100644 index 0000000000..67c3b1a699 --- /dev/null +++ b/lua/lspconfig/configs/buflsp.lua @@ -0,0 +1,21 @@ +local util = require 'lspconfig.util' + +return { + default_config = { + + cmd = { 'buf', 'beta', 'lsp' }, + filetypes = { 'proto' }, + root_dir = function(fname) + return require('lspconfig.util').root_pattern('buf.work.yaml', '.git')(fname) + end, + }, + docs = { + description = [[ +https://github.com/bufbuild/buf + +buf beta lsp included in the cli itself + +buf beta lsp is a Protobuf language server compatible with Buf modules and workspaces +]], + }, +} From 610d7fde650ac47419b531ed12cb3b3ccbe079fd Mon Sep 17 00:00:00 2001 From: gogamid <36050790+gogamid@users.noreply.github.com> Date: Sat, 2 Nov 2024 16:13:26 +0100 Subject: [PATCH 2/6] fix(buf): change to root pattern buf.yaml --- lua/lspconfig/configs/buflsp.lua | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lua/lspconfig/configs/buflsp.lua b/lua/lspconfig/configs/buflsp.lua index 67c3b1a699..2ebb9698a8 100644 --- a/lua/lspconfig/configs/buflsp.lua +++ b/lua/lspconfig/configs/buflsp.lua @@ -1,13 +1,9 @@ -local util = require 'lspconfig.util' - return { default_config = { cmd = { 'buf', 'beta', 'lsp' }, filetypes = { 'proto' }, - root_dir = function(fname) - return require('lspconfig.util').root_pattern('buf.work.yaml', '.git')(fname) - end, + root_dir = require('lspconfig.util').root_pattern('buf.yaml', '.git'), }, docs = { description = [[ From 6ee2b25a08d9b1a6731bfd4084b340586b17c946 Mon Sep 17 00:00:00 2001 From: gogamid <36050790+gogamid@users.noreply.github.com> Date: Sat, 2 Nov 2024 23:05:51 +0100 Subject: [PATCH 3/6] feat(buf): set timeout and log-format --- lua/lspconfig/configs/buflsp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/lspconfig/configs/buflsp.lua b/lua/lspconfig/configs/buflsp.lua index 2ebb9698a8..2a0d93c5bc 100644 --- a/lua/lspconfig/configs/buflsp.lua +++ b/lua/lspconfig/configs/buflsp.lua @@ -1,7 +1,7 @@ return { default_config = { - cmd = { 'buf', 'beta', 'lsp' }, + cmd = { 'buf', 'beta', 'lsp', '--timeout=0', '--log-format=text' }, filetypes = { 'proto' }, root_dir = require('lspconfig.util').root_pattern('buf.yaml', '.git'), }, From 31cc46ef3e5e9a1a11df4a5a7c23ea20fcd22a9c Mon Sep 17 00:00:00 2001 From: glepnir Date: Sun, 3 Nov 2024 09:52:08 +0800 Subject: [PATCH 4/6] fix(buf): update lua/lspconfig/configs/buflsp.lua --- lua/lspconfig/configs/buflsp.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/lua/lspconfig/configs/buflsp.lua b/lua/lspconfig/configs/buflsp.lua index 2a0d93c5bc..2ce9fc74c9 100644 --- a/lua/lspconfig/configs/buflsp.lua +++ b/lua/lspconfig/configs/buflsp.lua @@ -1,6 +1,5 @@ return { default_config = { - cmd = { 'buf', 'beta', 'lsp', '--timeout=0', '--log-format=text' }, filetypes = { 'proto' }, root_dir = require('lspconfig.util').root_pattern('buf.yaml', '.git'), From 55bb18a13efea91291595cdd92489c2efe2f1ffa Mon Sep 17 00:00:00 2001 From: gogamid <36050790+gogamid@users.noreply.github.com> Date: Sun, 3 Nov 2024 18:01:24 +0100 Subject: [PATCH 5/6] fix(buf): change file name --- lua/lspconfig/configs/{buflsp.lua => buf_ls.lua} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename lua/lspconfig/configs/{buflsp.lua => buf_ls.lua} (100%) diff --git a/lua/lspconfig/configs/buflsp.lua b/lua/lspconfig/configs/buf_ls.lua similarity index 100% rename from lua/lspconfig/configs/buflsp.lua rename to lua/lspconfig/configs/buf_ls.lua From 9bfb026b71ea7d018634e5f3e3646987f9ce449c Mon Sep 17 00:00:00 2001 From: gogamid <36050790+gogamid@users.noreply.github.com> Date: Tue, 5 Nov 2024 16:38:58 +0100 Subject: [PATCH 6/6] chore(bufls): depricate the old server for buf --- lua/lspconfig.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lua/lspconfig.lua b/lua/lspconfig.lua index e1e6084dcd..325fcdf2e5 100644 --- a/lua/lspconfig.lua +++ b/lua/lspconfig.lua @@ -31,6 +31,10 @@ local aliases = { to = 'ts_ls', version = '0.2.1', }, + bufls = { + to = 'bufls', + version = '0.2.1', + }, } ---@return Alias