diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2020-12-16 13:59:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-16 13:59:36 +0100 |
| commit | 5e202f69b3e42b90bc0393b0cee3bfddd2678216 (patch) | |
| tree | ee47f60e0161ec9f7134ee71c78b21d3b7808911 /runtime/lua/vim/treesitter/languagetree.lua | |
| parent | 958ebc7337bb9ee8d39516f0a079cd518a3e3ef4 (diff) | |
| parent | 929f19414599cf61bfc7664798d170af613b510d (diff) | |
| download | rneovim-5e202f69b3e42b90bc0393b0cee3bfddd2678216.tar.gz rneovim-5e202f69b3e42b90bc0393b0cee3bfddd2678216.tar.bz2 rneovim-5e202f69b3e42b90bc0393b0cee3bfddd2678216.zip | |
Merge pull request #13367 from nvim-treesitter/offset-lang-injection
feat(treesitter): add offset predicate for language injection
Diffstat (limited to 'runtime/lua/vim/treesitter/languagetree.lua')
| -rw-r--r-- | runtime/lua/vim/treesitter/languagetree.lua | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua index 04b5fee256..9c620c422c 100644 --- a/runtime/lua/vim/treesitter/languagetree.lua +++ b/runtime/lua/vim/treesitter/languagetree.lua @@ -289,7 +289,7 @@ function LanguageTree:_get_injections() local root_node = tree:root() local start_line, _, end_line, _ = root_node:range() - for pattern, match in self._injection_query:iter_matches(root_node, self._source, start_line, end_line+1) do + for pattern, match, metadata in self._injection_query:iter_matches(root_node, self._source, start_line, end_line+1) do local lang = nil local injection_node = nil local combined = false @@ -298,9 +298,9 @@ function LanguageTree:_get_injections() -- using a tag with the language, for example -- @javascript for id, node in pairs(match) do + local data = metadata[id] local name = self._injection_query.captures[id] - -- TODO add a way to offset the content passed to the parser. - -- Needed to shave off leading quotes and things of that nature. + local offset_range = data and data.offset -- Lang should override any other language tag if name == "language" then @@ -308,7 +308,7 @@ function LanguageTree:_get_injections() elseif name == "combined" then combined = true elseif name == "content" then - injection_node = node + injection_node = offset_range or node -- Ignore any tags that start with "_" -- Allows for other tags to be used in matches elseif string.sub(name, 1, 1) ~= "_" then @@ -317,7 +317,7 @@ function LanguageTree:_get_injections() end if not injection_node then - injection_node = node + injection_node = offset_range or node end end end |