diff options
| -rw-r--r-- | lua/lspconfig/util.lua | 11 | ||||
| -rw-r--r-- | test/lspconfig_spec.lua | 15 |
2 files changed, 5 insertions, 21 deletions
diff --git a/lua/lspconfig/util.lua b/lua/lspconfig/util.lua index 9b888efe..dd84f4f8 100644 --- a/lua/lspconfig/util.lua +++ b/lua/lspconfig/util.lua @@ -97,10 +97,6 @@ end -- Some path utilities M.path = (function() - local function escape_wildcards(path) - return path:gsub('([%[%]%?%*])', '\\%1') - end - --- @param path string --- @return boolean local function is_fs_root(path) @@ -179,7 +175,6 @@ M.path = (function() local path_separator = iswin and ';' or ':' return { - escape_wildcards = escape_wildcards, is_absolute = is_absolute, join = path_join, traverse_parents = traverse_parents, @@ -216,13 +211,17 @@ function M.get_lsp_clients(filter) return nvim_eleven and lsp.get_clients(filter) or lsp.get_active_clients(filter) end +local function escape_wildcards(path) + return path:gsub('([%[%]%?%*])', '\\%1') +end + function M.root_pattern(...) local patterns = M.tbl_flatten { ... } return function(startpath) startpath = M.strip_archive_subpath(startpath) for _, pattern in ipairs(patterns) do local match = M.search_ancestors(startpath, function(path) - for _, p in ipairs(vim.fn.glob(M.path.join(M.path.escape_wildcards(path), pattern), true, true)) do + for _, p in ipairs(vim.fn.glob(M.path.join(escape_wildcards(path), pattern), true, true)) do if vim.loop.fs_stat(p) then return path end diff --git a/test/lspconfig_spec.lua b/test/lspconfig_spec.lua index 256faba2..a34dc40e 100644 --- a/test/lspconfig_spec.lua +++ b/test/lspconfig_spec.lua @@ -10,21 +10,6 @@ describe('lspconfig', function() describe('util', function() describe('path', function() - describe('escape_wildcards', function() - it('doesnt escape if not needed', function() - local lspconfig = require 'lspconfig' - - local res = lspconfig.util.path.escape_wildcards '/usr/local/test/fname.lua' - eq('/usr/local/test/fname.lua', res) - end) - it('escapes if needed', function() - local lspconfig = require 'lspconfig' - - local res = lspconfig.util.path.escape_wildcards '/usr/local/test/[sq brackets] fname?*.lua' - eq('/usr/local/test/\\[sq brackets\\] fname\\?\\*.lua', res) - end) - end) - describe('is_absolute', function() it('is absolute', function() local lspconfig = require 'lspconfig' |