diff options
| author | Thomas Vigouroux <tomvig38@gmail.com> | 2020-09-01 12:50:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-01 12:50:21 +0200 |
| commit | 4bcf54478ad4ce47908f2eb912b6d98d81e6a78d (patch) | |
| tree | efc995d071956130e9ac2c89cddc57b86cf2d760 | |
| parent | 04ab26b88591ce5afa427c9a8badb9fcf1b95685 (diff) | |
| parent | b058c671d2fb34b53d7499d77e7eb9624e1508a9 (diff) | |
| download | rneovim-4bcf54478ad4ce47908f2eb912b6d98d81e6a78d.tar.gz rneovim-4bcf54478ad4ce47908f2eb912b6d98d81e6a78d.tar.bz2 rneovim-4bcf54478ad4ce47908f2eb912b6d98d81e6a78d.zip | |
Merge pull request #12814 from theHamsta/escape-queries
treesitter: avoid escaping complete query strings
| -rw-r--r-- | runtime/lua/vim/treesitter/query.lua | 4 | ||||
| -rw-r--r-- | test/functional/lua/treesitter_spec.lua | 29 |
2 files changed, 31 insertions, 2 deletions
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua index 17f61b24f1..803b9edbf0 100644 --- a/runtime/lua/vim/treesitter/query.lua +++ b/runtime/lua/vim/treesitter/query.lua @@ -17,7 +17,7 @@ local M = {} function M.parse_query(lang, query) language.require_language(lang) local self = setmetatable({}, Query) - self.query = vim._ts_parse_query(lang, vim.fn.escape(query,'\\')) + self.query = vim._ts_parse_query(lang, query) self.info = self.query:inspect() self.captures = self.info.captures return self @@ -82,7 +82,7 @@ local predicate_handlers = { local compiled_vim_regexes = setmetatable({}, { __index = function(t, pattern) - local res = vim.regex(check_magic(pattern)) + local res = vim.regex(check_magic(vim.fn.escape(pattern, '\\'))) rawset(t, pattern, res) return res end diff --git a/test/functional/lua/treesitter_spec.lua b/test/functional/lua/treesitter_spec.lua index 12b0e6ef9f..aa36e6f8f0 100644 --- a/test/functional/lua/treesitter_spec.lua +++ b/test/functional/lua/treesitter_spec.lua @@ -250,6 +250,35 @@ void ui_refresh(void) }, res) end) + it('allow loading query with escaped quotes and capture them with `match?` and `vim-match?`', function() + if not check_parser() then return end + + insert('char* astring = "Hello World!";') + + local res = exec_lua([[ + cquery = vim.treesitter.parse_query("c", '((_) @quote (vim-match? @quote "^\\"$")) ((_) @quote (match? @quote "^\\"$"))') + parser = vim.treesitter.get_parser(0, "c") + tree = parser:parse() + res = {} + for pattern, match in cquery:iter_matches(tree:root(), 0, 0, 1) do + -- can't transmit node over RPC. just check the name and range + local mrepr = {} + for cid,node in pairs(match) do + table.insert(mrepr, {cquery.captures[cid], node:type(), node:range()}) + end + table.insert(res, {pattern, mrepr}) + end + return res + ]]) + + eq({ + { 1, { { "quote", '"', 0, 16, 0, 17 } } }, + { 2, { { "quote", '"', 0, 16, 0, 17 } } }, + { 1, { { "quote", '"', 0, 29, 0, 30 } } }, + { 2, { { "quote", '"', 0, 29, 0, 30 } } }, + }, res) + end) + it('allows to add predicates', function() insert([[ int main(void) { |