From 8672f6e82fc0e3e20a7014d59fbcd71665612df1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Mon, 26 Jun 2023 18:04:10 +0200 Subject: [PATCH] fix(neovim): refactor tableMerge function --- home/editors/neovim/lsp/lsp.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/home/editors/neovim/lsp/lsp.lua b/home/editors/neovim/lsp/lsp.lua index 55d4962..b2ed61a 100644 --- a/home/editors/neovim/lsp/lsp.lua +++ b/home/editors/neovim/lsp/lsp.lua @@ -52,7 +52,8 @@ end local config = require("lspconfig") local configs = require("lspconfig.configs") -function table.merge(t1, t2) +-- functional variant of table.merge +local function tableMerge(t1, t2) local t = {} for k, v in ipairs(t1) do table.insert(t, v) end for k, v in ipairs(t2) do table.insert(t, v) end @@ -62,7 +63,7 @@ end -- first search git root for global config (monorepo) -- and fall back to normal search order otherwise local monorepo_pattern = function(main_patterns, other_patterns, f) - local all_patterns = table.merge(main_patterns, other_patterns) + local all_patterns = tableMerge(main_patterns, other_patterns) local git_root = config.util.root_pattern(".git")(f) local git_root_sln = config.util.root_pattern(unpack(main_patterns))(git_root) return git_root_sln or config.util.root_pattern(unpack(all_patterns))(f)