From 9ff2a06cebd4c8c3af5259d713959ab310125bec Mon Sep 17 00:00:00 2001
From: William Boman <william@redwill.se>
Date: Thu, 12 May 2022 17:21:02 +0200
Subject: fix(jsonnet_ls): merge cmd_env instead of ovdrriding it entirely
 #1559

---
 lua/lspconfig/server_configurations/jsonnet_ls.lua | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'lua')

diff --git a/lua/lspconfig/server_configurations/jsonnet_ls.lua b/lua/lspconfig/server_configurations/jsonnet_ls.lua
index 3493e7eb..64e86cbd 100644
--- a/lua/lspconfig/server_configurations/jsonnet_ls.lua
+++ b/lua/lspconfig/server_configurations/jsonnet_ls.lua
@@ -17,9 +17,12 @@ return {
       return util.root_pattern 'jsonnetfile.json'(fname) or util.find_git_ancestor(fname)
     end,
     on_new_config = function(new_config, root_dir)
-      new_config.cmd_env = {
-        JSONNET_PATH = jsonnet_path(root_dir),
-      }
+      if not new_config.cmd_env then
+        new_config.cmd_env = {}
+      end
+      if not new_config.cmd_env.JSONNET_PATH then
+        new_config.cmd_env.JSONNET_PATH = jsonnet_path(root_dir)
+      end
     end,
   },
   docs = {
-- 
cgit v1.2.3-70-g09d2