From 25c4241b07d2036fc5d0d4c18be43a16a5370ef0 Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Sat, 22 Oct 2022 15:25:46 +0200
Subject: refactor: clean up test env paths (#3318)

---
 lua/lvim/bootstrap.lua  | 5 +----
 lua/lvim/lsp/config.lua | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'lua')

diff --git a/lua/lvim/bootstrap.lua b/lua/lvim/bootstrap.lua
index 5d980498..55a22502 100644
--- a/lua/lvim/bootstrap.lua
+++ b/lua/lvim/bootstrap.lua
@@ -10,7 +10,6 @@ end
 
 local uv = vim.loop
 local path_sep = uv.os_uname().version:match "Windows" and "\\" or "/"
-local in_headless = #vim.api.nvim_list_uis() == 0
 
 ---Join path segments that were passed as input
 ---@return string
@@ -96,9 +95,7 @@ function M:init(base_dir)
     vim.cmd [[let &packpath = &runtimepath]]
   end
 
-  -- FIXME: currently unreliable in unit-tests
-  if not in_headless then
-    _G.PLENARY_DEBUG = false
+  if not vim.env.LVIM_TEST_ENV then
     require "lvim.impatient"
   end
 
diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua
index 358e83f8..eeba9fb0 100644
--- a/lua/lvim/lsp/config.lua
+++ b/lua/lvim/lsp/config.lua
@@ -39,7 +39,7 @@ local skipped_servers = {
   "vuels",
 }
 
-local skipped_filetypes = { "markdown", "rst", "plaintext" }
+local skipped_filetypes = { "markdown", "rst", "plaintext", "toml" }
 
 local join_paths = require("lvim.utils").join_paths
 
-- 
cgit v1.2.3