Rename nvim_lsp to lspconfig

58 files changed, 126 insertions, 126 deletions

diff --git a/lua/nvim_lsp.lua b/lua/lspconfig.lua
index 2b9154ad..cc9b38bc 100644
--- a/lua/nvim_lsp.lua
+++ b/lua/lspconfig.lua
@@ -1,7 +1,7 @@
-local configs = require 'nvim_lsp/configs'
+local configs = require 'lspconfig/configs'
 
 local M = {
-  util = require 'nvim_lsp/util';
+  util = require 'lspconfig/util';
 }
 
 function M.available_servers()
@@ -17,14 +17,14 @@ function M.installable_servers()
 end
 
 M._root = {}
--- Called from plugin/nvim_lsp.vim because it requires knowing that the last
--- script in scriptnames to be executed is nvim_lsp.
+-- Called from plugin/lspconfig.vim because it requires knowing that the last
+-- script in scriptnames to be executed is lspconfig.
 function M._root._setup()
   M._root.commands = {
     LspInstall = {
       function(name)
         if configs[name] == nil then
-          pcall(require('nvim_lsp/'..name))
+          pcall(require('lspconfig/'..name))
         end
         local config = configs[name]
         if not config then
@@ -40,7 +40,7 @@ function M._root._setup()
       end;
       "-nargs=1";
       "-complete=custom,v:lua.lsp_complete_installable_servers";
-      description = '`:LspInstall {name}` installs a server under stdpath("cache")/nvim_lsp/{name}';
+      description = '`:LspInstall {name}` installs a server under stdpath("cache")/lspconfig/{name}';
     };
     LspInstallInfo = {
       function(name)
@@ -54,7 +54,7 @@ function M._root._setup()
           return print(vim.inspect(res))
         end
         if configs[name] == nil then
-          pcall(require('nvim_lsp/'..name))
+          pcall(require('lspconfig/'..name))
         end
         local config = configs[name]
         if not config then
@@ -74,7 +74,7 @@ end
 local mt = {}
 function mt:__index(k)
   if configs[k] == nil then
-    require('nvim_lsp/'..k)
+    require('lspconfig/'..k)
   end
   return configs[k]
 end
diff --git a/lua/nvim_lsp/als.lua b/lua/lspconfig/als.lua
index 60605718..c5c4a116 100755
--- a/lua/nvim_lsp/als.lua
+++ b/lua/lspconfig/als.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 local server_name = 'als'
 local bin_name = 'ada_language_server'
 
@@ -83,7 +83,7 @@ Ada language server. Use `LspInstall als` to install it.
 Can be configured by passing a "settings" object to `als.setup{}`:
 
 ```lua
-require('nvim_lsp').als.setup{
+require('lspconfig').als.setup{
     settings = {
       ada = {
         projectFile = "project.gpr";
diff --git a/lua/nvim_lsp/angularls.lua b/lua/lspconfig/angularls.lua
index 88006f62..f579909f 100644
--- a/lua/nvim_lsp/angularls.lua
+++ b/lua/lspconfig/angularls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = 'angularls'
 local bin_name = server_name
diff --git a/lua/nvim_lsp/bashls.lua b/lua/lspconfig/bashls.lua
index 0bc9604c..59b21079 100644
--- a/lua/nvim_lsp/bashls.lua
+++ b/lua/lspconfig/bashls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "bashls"
 local bin_name = "bash-language-server"
diff --git a/lua/nvim_lsp/ccls.lua b/lua/lspconfig/ccls.lua
index 32cc30e9..d167249d 100644
--- a/lua/nvim_lsp/ccls.lua
+++ b/lua/lspconfig/ccls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.ccls = {
   default_config = {
diff --git a/lua/nvim_lsp/clangd.lua b/lua/lspconfig/clangd.lua
index f369febb..d165edbb 100644
--- a/lua/nvim_lsp/clangd.lua
+++ b/lua/lspconfig/clangd.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 -- https://clangd.llvm.org/extensions.html#switch-between-sourceheader
 local function switch_source_header(bufnr)
diff --git a/lua/nvim_lsp/clojure_lsp.lua b/lua/lspconfig/clojure_lsp.lua
index f314b309..f1ec6932 100644
--- a/lua/nvim_lsp/clojure_lsp.lua
+++ b/lua/lspconfig/clojure_lsp.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.clojure_lsp = {
   default_config = {
diff --git a/lua/nvim_lsp/cmake.lua b/lua/lspconfig/cmake.lua
index b47d23a2..9dbcf717 100755
--- a/lua/nvim_lsp/cmake.lua
+++ b/lua/lspconfig/cmake.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.cmake = {
   default_config = {
diff --git a/lua/nvim_lsp/codeqlls.lua b/lua/lspconfig/codeqlls.lua
index 613d551e..ffe08df4 100644
--- a/lua/nvim_lsp/codeqlls.lua
+++ b/lua/lspconfig/codeqlls.lua
@@ -1,5 +1,5 @@
-local configs = require "nvim_lsp/configs"
-local util = require "nvim_lsp/util"
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "codeqlls"
 
diff --git a/lua/nvim_lsp/configs.lua b/lua/lspconfig/configs.lua
index deca856e..16ef9949 100644
--- a/lua/nvim_lsp/configs.lua
+++ b/lua/lspconfig/configs.lua
@@ -1,4 +1,4 @@
-local util = require 'nvim_lsp/util'
+local util = require 'lspconfig/util'
 local api, validate, lsp = vim.api, vim.validate, vim.lsp
 local tbl_extend = vim.tbl_extend
 
@@ -99,7 +99,7 @@ function configs.__newindex(t, config_name, config_def)
       trigger = "BufReadPost *"
     end
     api.nvim_command(string.format(
-        "autocmd %s lua require'nvim_lsp'[%q].manager.try_add()"
+        "autocmd %s lua require'lspconfig'[%q].manager.try_add()"
         , trigger
         , config.name
         ))
@@ -154,7 +154,7 @@ function configs.__newindex(t, config_name, config_def)
           M._setup_buffer(client.id)
         else
           api.nvim_command(string.format(
-              "autocmd BufEnter <buffer=%d> ++once lua require'nvim_lsp'[%q]._setup_buffer(%d)"
+              "autocmd BufEnter <buffer=%d> ++once lua require'lspconfig'[%q]._setup_buffer(%d)"
               , bufnr
               , config_name
               , client.id
diff --git a/lua/nvim_lsp/cssls.lua b/lua/lspconfig/cssls.lua
index 5517e7a1..7b50950a 100644
--- a/lua/nvim_lsp/cssls.lua
+++ b/lua/lspconfig/cssls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "cssls"
 local bin_name = "css-languageserver"
diff --git a/lua/nvim_lsp/dartls.lua b/lua/lspconfig/dartls.lua
index 182204cf..1baf05d6 100644
--- a/lua/nvim_lsp/dartls.lua
+++ b/lua/lspconfig/dartls.lua
@@ -1,5 +1,5 @@
-local nvim_lsp = require 'nvim_lsp'
-local configs = require 'nvim_lsp/configs'
+local util = require 'lspconfig/util'
+local configs = require 'lspconfig/configs'
 
 local server_name = "dartls"
 local bin_name = "dart"
@@ -31,7 +31,7 @@ configs[server_name] = {
   default_config = {
     cmd = {bin_name, analysis_server_snapshot_path(), "--lsp"};
     filetypes = {"dart"};
-    root_dir = nvim_lsp.util.root_pattern("pubspec.yaml");
+    root_dir = util.root_pattern("pubspec.yaml");
     init_options = {
       onlyAnalyzeProjectsWithOpenFiles = "false",
       suggestFromUnimportedLibraries = "true",
diff --git a/lua/nvim_lsp/diagnosticls.lua b/lua/lspconfig/diagnosticls.lua
index 4bdd5226..c4f26220 100644
--- a/lua/nvim_lsp/diagnosticls.lua
+++ b/lua/lspconfig/diagnosticls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "diagnosticls"
 local bin_name = "diagnostic-languageserver"
diff --git a/lua/nvim_lsp/dockerls.lua b/lua/lspconfig/dockerls.lua
index 941d2c84..572e4701 100644
--- a/lua/nvim_lsp/dockerls.lua
+++ b/lua/lspconfig/dockerls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "dockerls"
 local bin_name = "docker-langserver"
diff --git a/lua/nvim_lsp/efm.lua b/lua/lspconfig/efm.lua
index 621d2be1..d4fc88ac 100644
--- a/lua/nvim_lsp/efm.lua
+++ b/lua/lspconfig/efm.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "efm"
 local bin_name = "efm-langserver"
diff --git a/lua/nvim_lsp/elixirls.lua b/lua/lspconfig/elixirls.lua
index d0a2fbd6..fcd91a04 100644
--- a/lua/nvim_lsp/elixirls.lua
+++ b/lua/lspconfig/elixirls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "elixirls"
 local bin_name = "elixir-ls"
@@ -90,7 +90,7 @@ This language server does not provide a global binary, but must be installed man
 Fetching the elixir-ls repository from GitHub, compiling it and then installing it.
 
 ```lua
-require'nvim_lsp'.elixirls.setup{
+require'lspconfig'.elixirls.setup{
     -- Unix
     cmd = { "path/to/language_server.sh" };
     -- Windows
diff --git a/lua/nvim_lsp/elmls.lua b/lua/lspconfig/elmls.lua
index 94e1b25d..c35824c4 100644
--- a/lua/nvim_lsp/elmls.lua
+++ b/lua/lspconfig/elmls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 local lsp = vim.lsp
 local api = vim.api
 
diff --git a/lua/nvim_lsp/flow.lua b/lua/lspconfig/flow.lua
index 998ecb89..5e0abab3 100644
--- a/lua/nvim_lsp/flow.lua
+++ b/lua/lspconfig/flow.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.flow = {
   default_config = {
diff --git a/lua/nvim_lsp/fortls.lua b/lua/lspconfig/fortls.lua
index a94e4dd3..7a66c703 100644
--- a/lua/nvim_lsp/fortls.lua
+++ b/lua/lspconfig/fortls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.fortls = {
   default_config = {
diff --git a/lua/nvim_lsp/gdscript.lua b/lua/lspconfig/gdscript.lua
index e4dfb5c3..ecd3288f 100644
--- a/lua/nvim_lsp/gdscript.lua
+++ b/lua/lspconfig/gdscript.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.gdscript = {
   default_config = {
diff --git a/lua/nvim_lsp/ghcide.lua b/lua/lspconfig/ghcide.lua
index ee801de6..c427d599 100644
--- a/lua/nvim_lsp/ghcide.lua
+++ b/lua/lspconfig/ghcide.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.ghcide = {
   default_config = {
diff --git a/lua/nvim_lsp/gopls.lua b/lua/lspconfig/gopls.lua
index 53638e5f..08eacc15 100644