add eslint, deprecate eslintls (#149)

4 files changed, 12 insertions, 5 deletions

diff --git a/lua/nvim-lsp-installer/servers/eslintls/README.md b/lua/nvim-lsp-installer/servers/eslint/README.md
index 2a5307df..557e986b 100644
--- a/lua/nvim-lsp-installer/servers/eslintls/README.md
+++ b/lua/nvim-lsp-installer/servers/eslint/README.md
@@ -1,8 +1,8 @@
-# eslintls
+# eslint
 
 ## Enabling document formatting
 
-To make the `eslintls` server respond to `textDocument/formatting` LSP requests, you need to manually enable this
+To make the `eslint` server respond to `textDocument/formatting` LSP requests, you need to manually enable this
 setting. This is done when setting up the LSP server, like so:
 
 ```lua
@@ -15,10 +15,10 @@ lsp_installer.on_server_ready(function (server)
         on_attach = common_on_attach,
     }
 
-    if server.name == "eslintls" then
+    if server.name == "eslint" then
         opts.on_attach = function (client, bufnr)
             -- neovim's LSP client does not currently support dynamic capabilities registration, so we need to set
-            -- the resolved capabilities of the eslintls server ourselves!
+            -- the resolved capabilities of the eslint server ourselves!
             client.resolved_capabilities.document_formatting = true
             common_on_attach(client, bufnr)
         end
@@ -31,7 +31,7 @@ lsp_installer.on_server_ready(function (server)
 end)
 ```
 
-This will make `eslintls` respond to formatting requests, for example when triggered through:
+This will make `eslint` respond to formatting requests, for example when triggered through:
 
 -   `:lua vim.lsp.buf.formatting()`
 -   `:lua vim.lsp.buf.formatting_seq_sync()`
diff --git a/lua/nvim-lsp-installer/servers/eslint/init.lua b/lua/nvim-lsp-installer/servers/eslint/init.lua
new file mode 100644
index 00000000..21979405
--- /dev/null
+++ b/lua/nvim-lsp-installer/servers/eslint/init.lua
@@ -0,0 +1 @@
+return require "nvim-lsp-installer.servers.vscode-langservers-extracted" "vscode-eslint-language-server"
diff --git a/lua/nvim-lsp-installer/servers/eslintls/init.lua b/lua/nvim-lsp-installer/servers/eslintls/init.lua
index 3e9d3cc3..7ffad30f 100644
--- a/lua/nvim-lsp-installer/servers/eslintls/init.lua
+++ b/lua/nvim-lsp-installer/servers/eslintls/init.lua
@@ -15,6 +15,10 @@ return function(name, root_dir)
     return server.Server:new {
         name = name,
         root_dir = root_dir,
+        deprecated = {
+            message = "eslintls has been replaced with eslint. It's still the same server - just a different name and upstream dependencies.",
+            replace_with = "eslint",
+        },
         installer = {
             std.git_clone "https://github.com/microsoft/vscode-eslint",
             npm.install(),
diff --git a/lua/nvim-lsp-installer/servers/init.lua b/lua/nvim-lsp-installer/servers/init.lua
index 35c23627..cdef8780 100644
--- a/lua/nvim-lsp-installer/servers/init.lua
+++ b/lua/nvim-lsp-installer/servers/init.lua
@@ -20,6 +20,7 @@ local INSTALL_DIRS = {
     ["dockerls"] = "dockerfile",
     ["elixirls"] = "elixir",
     ["elmls"] = "elm",
+    ["eslint"] = "vscode-eslint",
     ["eslintls"] = "eslint",
     ["gopls"] = "go",
     ["hls"] = "haskell",
@@ -57,6 +58,7 @@ local CORE_SERVERS = Data.set_of {
     "ember",
     "emmet_ls",
     "erlangls",
+    "eslint",
     "eslintls",
     "fortls",
     "gopls",