From 796c7b3ee7d10fb90893a2322d85495847e3f779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <es.ensar@gmail.com>
Date: Thu, 23 Sep 2021 13:06:48 +0200
Subject: [PATCH] Use cucumber-language-server from lspconfig

---
 .../nvim/lua/lsp/extra_servers/cucumber.lua   | 19 -------------------
 .../nvim/lua/lsp/extra_servers/init.lua       |  3 +++
 symlinks/config/nvim/lua/lsp/servers.lua      |  3 +--
 3 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 symlinks/config/nvim/lua/lsp/extra_servers/cucumber.lua
 create mode 100644 symlinks/config/nvim/lua/lsp/extra_servers/init.lua

diff --git a/symlinks/config/nvim/lua/lsp/extra_servers/cucumber.lua b/symlinks/config/nvim/lua/lsp/extra_servers/cucumber.lua
deleted file mode 100644
index 3686d49..0000000
--- a/symlinks/config/nvim/lua/lsp/extra_servers/cucumber.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-local configs = require 'lspconfig/configs'
-local util = require 'lspconfig/util'
-
-configs.cucumberls = {
-  default_config = {
-    cmd = { 'cucumber-language-server', '--stdio' },
-    filetypes = { 'cucumber' },
-    root_dir = util.root_pattern('.git'),
-  },
-  docs = {
-    description = [[
-https://www.npmjs.com/package/@cucumber/language-server
-Cucumber Language Server
-]],
-    default_config = {
-      root_dir = [[root_pattern(".git")]],
-    },
-  },
-}
diff --git a/symlinks/config/nvim/lua/lsp/extra_servers/init.lua b/symlinks/config/nvim/lua/lsp/extra_servers/init.lua
new file mode 100644
index 0000000..df106c7
--- /dev/null
+++ b/symlinks/config/nvim/lua/lsp/extra_servers/init.lua
@@ -0,0 +1,3 @@
+-------------------------------------------------------------------------------
+--    - Servers not currently supported by lspconfig go in this package -    --
+-------------------------------------------------------------------------------
diff --git a/symlinks/config/nvim/lua/lsp/servers.lua b/symlinks/config/nvim/lua/lsp/servers.lua
index 509681d..5d3e1c8 100644
--- a/symlinks/config/nvim/lua/lsp/servers.lua
+++ b/symlinks/config/nvim/lua/lsp/servers.lua
@@ -3,7 +3,6 @@
 -------------------------------------------------------------------------------
 
 local lspconfig = require("lspconfig")
-require("lsp.extra_servers.cucumber")
 
 local on_attach = function(client, bufnr)
 	local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
@@ -27,7 +26,7 @@ local on_attach = function(client, bufnr)
 end
 
 -- Lsp default language servers
-local servers = { "bashls", "clangd", "cucumberls", "dockerls", "jsonls", "pyright", "rust_analyzer", "kotlin_language_server", "vimls", "clojure_lsp", "gopls", "gdscript", "terraformls", "tsserver" }
+local servers = { "bashls", "clangd", "cucumber_language_server", "dockerls", "jsonls", "pyright", "rust_analyzer", "kotlin_language_server", "vimls", "clojure_lsp", "gopls", "gdscript", "terraformls", "tsserver" }
 for _, lsp in ipairs(servers) do
   lspconfig[lsp].setup { on_attach = on_attach }
 end