From 6fe69025b8825029ea9bf291ab3b1750f9bcb39e Mon Sep 17 00:00:00 2001 From: Raphael Date: Wed, 12 Apr 2023 11:52:32 +0800 Subject: fix(eslint): get root patterns by given path (#2556) --- lua/lspconfig/util.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lua/lspconfig/util.lua') diff --git a/lua/lspconfig/util.lua b/lua/lspconfig/util.lua index 8725413b..5aff4f39 100644 --- a/lua/lspconfig/util.lua +++ b/lua/lspconfig/util.lua @@ -487,15 +487,16 @@ function M.find_package_json_ancestor(startpath) end) end -function M.insert_package_json(config_files, field) - local root_with_package = M.find_package_json_ancestor(vim.fn.expand '%:p:h') +function M.insert_package_json(config_files, field, fname) + local path = vim.fn.fnamemodify(fname, ':h') + local root_with_package = M.find_package_json_ancestor(path) if root_with_package then -- only add package.json if it contains field parameter local path_sep = is_windows and '\\' or '/' for line in io.lines(root_with_package .. path_sep .. 'package.json') do if line:find(field) then - table.insert(config_files, 'package.json') + config_files[#config_files + 1] = 'package.json' break end end -- cgit v1.2.3-70-g09d2