perf: use the truly minimal test config file (#2269)

1 files changed, 45 insertions, 72 deletions

diff --git a/test/minimal_init.lua b/test/minimal_init.lua
index ba2ae3fc..841cb67c 100644
--- a/test/minimal_init.lua
+++ b/test/minimal_init.lua
@@ -13,84 +13,57 @@ local temp_dir = vim.loop.os_getenv 'TEMP' or '/tmp'
 vim.cmd('set packpath=' .. join_paths(temp_dir, 'nvim', 'site'))
 
 local package_root = join_paths(temp_dir, 'nvim', 'site', 'pack')
-local install_path = join_paths(package_root, 'packer', 'start', 'packer.nvim')
-local compile_path = join_paths(install_path, 'plugin', 'packer_compiled.lua')
+local lspconfig_path = join_paths(package_root, 'test', 'start', 'nvim-lspconfig')
 
-local function load_plugins()
-  require('packer').startup {
-    {
-      'wbthomason/packer.nvim',
-      'neovim/nvim-lspconfig',
-    },
-    config = {
-      package_root = package_root,
-      compile_path = compile_path,
-    },
-  }
+if vim.fn.isdirectory(lspconfig_path) ~= 1 then
+  vim.fn.system { 'git', 'clone', 'https://github.com/neovim/nvim-lspconfig', lspconfig_path }
 end
 
-local load_config = function()
-  vim.lsp.set_log_level 'trace'
-  require('vim.lsp.log').set_format_func(vim.inspect)
-  local nvim_lsp = require 'lspconfig'
-  local on_attach = function(_, bufnr)
-    local function buf_set_option(...)
-      vim.api.nvim_buf_set_option(bufnr, ...)
-    end
-
-    buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
-
-    -- Mappings.
-    local opts = { buffer = bufnr, noremap = true, silent = true }
-    vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
-    vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
-    vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
-    vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
-    vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
-    vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, opts)
-    vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, opts)
-    vim.keymap.set('n', '<space>wl', function()
-      print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-    end, opts)
-    vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, opts)
-    vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, opts)
-    vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
-    vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, opts)
-    vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
-    vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
-    vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
-  end
-
-  -- Add the server that troubles you here
-  local name = 'pyright'
-  local cmd = { 'pyright-langserver', '--stdio' } -- needed for elixirls, omnisharp, sumneko_lua
-  if not name then
-    print 'You have not defined a server name, please edit minimal_init.lua'
-  end
-  if not nvim_lsp[name].document_config.default_config.cmd and not cmd then
-    print [[You have not defined a server default cmd for a server
-      that requires it please edit minimal_init.lua]]
+vim.lsp.set_log_level 'trace'
+require('vim.lsp.log').set_format_func(vim.inspect)
+local nvim_lsp = require 'lspconfig'
+local on_attach = function(_, bufnr)
+  local function buf_set_option(...)
+    vim.api.nvim_buf_set_option(bufnr, ...)
   end
 
-  nvim_lsp[name].setup {
-    cmd = cmd,
-    on_attach = on_attach,
-  }
+  buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
 
-  print [[You can find your log at $HOME/.cache/nvim/lsp.log. Please paste in a github issue under a details tag as described in the issue template.]]
+  -- Mappings.
+  local opts = { buffer = bufnr, noremap = true, silent = true }
+  vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
+  vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
+  vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
+  vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
+  vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
+  vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, opts)
+  vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, opts)
+  vim.keymap.set('n', '<space>wl', function()
+    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+  end, opts)
+  vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, opts)
+  vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, opts)
+  vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
+  vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, opts)
+  vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
+  vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
+  vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
 end
 
-if vim.fn.isdirectory(install_path) == 0 then
-  vim.fn.system { 'git', 'clone', 'https://github.com/wbthomason/packer.nvim', install_path }
-  load_plugins()
-  require('packer').sync()
-  local packer_group = vim.api.nvim_create_augroup('Packer', { clear = true })
-  vim.api.nvim_create_autocmd(
-    'User',
-    { pattern = 'PackerComplete', callback = load_config, group = packer_group, once = true }
-  )
-else
-  load_plugins()
-  require('packer').sync()
-  load_config()
+-- Add the server that troubles you here
+local name = 'pyright'
+local cmd = { 'pyright-langserver', '--stdio' } -- needed for elixirls, omnisharp, sumneko_lua
+if not name then
+  print 'You have not defined a server name, please edit minimal_init.lua'
+end
+if not nvim_lsp[name].document_config.default_config.cmd and not cmd then
+  print [[You have not defined a server default cmd for a server
+    that requires it please edit minimal_init.lua]]
 end
+
+nvim_lsp[name].setup {
+  cmd = cmd,
+  on_attach = on_attach,
+}
+
+print [[You can find your log at $HOME/.cache/nvim/lsp.log. Please paste in a github issue under a details tag as described in the issue template.]]