mirror of
https://github.com/neovim/neovim.git
synced 2025-12-10 16:42:42 +00:00
fix(ts): escape lang when loading parsers (#16668)
When trying to load a language parser, escape the value of
the language.
With language injection, the language might be picked up from the
buffer. If this value is erroneous it can cause `nvim_get_runtime_file`
to hard error.
E.g., the markdown expression `~~~{` will extract '{' as a language and
then try to get the parser using `parser/{*` as the pattern.
This commit is contained in:
@@ -14,7 +14,7 @@ function M.require_language(lang, path, silent)
|
|||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
if path == nil then
|
if path == nil then
|
||||||
local fname = 'parser/' .. lang .. '.*'
|
local fname = 'parser/' .. vim.fn.fnameescape(lang) .. '.*'
|
||||||
local paths = a.nvim_get_runtime_file(fname, false)
|
local paths = a.nvim_get_runtime_file(fname, false)
|
||||||
if #paths == 0 then
|
if #paths == 0 then
|
||||||
if silent then
|
if silent then
|
||||||
|
|||||||
@@ -666,6 +666,21 @@ int x = INT_MAX;
|
|||||||
-- READ_STRING_OK(x, y) (char_u *)read_string((x), (size_t)(y))
|
-- READ_STRING_OK(x, y) (char_u *)read_string((x), (size_t)(y))
|
||||||
}, get_ranges())
|
}, get_ranges())
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
it("should not inject bad languages", function()
|
||||||
|
if helpers.pending_win32(pending) then return end
|
||||||
|
exec_lua([=[
|
||||||
|
vim.treesitter.add_directive("inject-bad!", function(match, _, _, pred, metadata)
|
||||||
|
metadata.language = "{"
|
||||||
|
metadata.combined = true
|
||||||
|
metadata.content = pred[2]
|
||||||
|
end)
|
||||||
|
|
||||||
|
parser = vim.treesitter.get_parser(0, "c", {
|
||||||
|
injections = {
|
||||||
|
c = "(preproc_function_def value: ((preproc_arg) @_a (#inject-bad! @_a)))"}})
|
||||||
|
]=])
|
||||||
|
end)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
describe("when using the offset directive", function()
|
describe("when using the offset directive", function()
|
||||||
|
|||||||
Reference in New Issue
Block a user