diff options
| -rw-r--r-- | lua/nvim-treesitter/configs.lua | 42 | ||||
| -rw-r--r-- | lua/nvim-treesitter/textobjects.lua | 268 | ||||
| -rw-r--r-- | lua/nvim-treesitter/textobjects/attach.lua | 61 | ||||
| -rw-r--r-- | lua/nvim-treesitter/textobjects/move.lua | 41 | ||||
| -rw-r--r-- | lua/nvim-treesitter/textobjects/select.lua | 55 | ||||
| -rw-r--r-- | lua/nvim-treesitter/textobjects/shared.lua | 142 | ||||
| -rw-r--r-- | lua/nvim-treesitter/textobjects/swap.lua | 35 |
7 files changed, 362 insertions, 282 deletions
diff --git a/lua/nvim-treesitter/configs.lua b/lua/nvim-treesitter/configs.lua index bcaa2819c..ba4ae3f8d 100644 --- a/lua/nvim-treesitter/configs.lua +++ b/lua/nvim-treesitter/configs.lua @@ -7,7 +7,7 @@ local utils = require'nvim-treesitter.utils' local M = {} local function has_some_textobject_mapping(lang) - for _, v in pairs(M.get_module('textobjects').keymaps) do + for _, v in pairs(M.get_module('textobjects.select').keymaps) do if type(v) == 'table' then if v[lang] then return true @@ -79,19 +79,33 @@ local builtin_modules = { } }, textobjects = { - module_path = 'nvim-treesitter.textobjects', - enable = false, - disable = {}, - is_supported = function(lang) - return has_some_textobject_mapping(lang) or queries.has_textobjects(lang) - end, - keymaps = {}, - swap_next = {}, - swap_previous = {}, - goto_next_start = {}, - goto_next_end = {}, - goto_previous_start = {}, - goto_previous_end = {} + select = { + module_path = 'nvim-treesitter.textobjects.select', + enable = false, + disable = {}, + is_supported = function(lang) + return has_some_textobject_mapping(lang) or queries.has_textobjects(lang) + end, + keymaps = {}, + }, + move = { + module_path = 'nvim-treesitter.textobjects.move', + enable = false, + disable = {}, + is_supported = queries.has_textobjects, + goto_next_start = {}, + goto_next_end = {}, + goto_previous_start = {}, + goto_previous_end = {}, + }, + swap = { + module_path = 'nvim-treesitter.textobjects.swap', + enable = false, + disable = {}, + is_supported = queries.has_textobjects, + swap_next = {}, + swap_previous = {}, + }, } } diff --git a/lua/nvim-treesitter/textobjects.lua b/lua/nvim-treesitter/textobjects.lua deleted file mode 100644 index 95b46cabc..000000000 --- a/lua/nvim-treesitter/textobjects.lua +++ /dev/null @@ -1,268 +0,0 @@ -local api = vim.api -local ts = vim.treesitter - -local configs = require "nvim-treesitter.configs" -local parsers = require "nvim-treesitter.parsers" -local queries = require'nvim-treesitter.query' -local ts_utils = require'nvim-treesitter.ts_utils' -local utils = require'nvim-treesitter.utils' - -local M = {} - -local function textobject_at_point(query_string) - local bufnr = vim.api.nvim_get_current_buf() - local lang = parsers.get_buf_lang(bufnr) - if not lang then return end - - local row, col = unpack(vim.api.nvim_win_get_cursor(0)) - row = row - 1 - - local matches = {} - - if string.match(query_string, '^@.*') then - matches = queries.get_capture_matches(bufnr, query_string, 'textobjects') - else - local parser = parsers.get_parser(bufnr, lang) - local root = parser:parse():root() - - local start_row, _, end_row, _ = root:range() - - local query = ts.parse_query(lang, query_string) - for m in queries.iter_prepared_matches(query, root, bufnr, start_row, end_row) do - for _, n in pairs(m) do - if n.node then - table.insert(matches, n) - end - end - end - end - - local match_length - local smallest_range - local earliest_start - - for _, m in pairs(matches) do - if m.node and ts_utils.is_in_node_range(m.node, row, col) then - local length = ts_utils.node_length(m.node) - if not match_length or length < match_length then - smallest_range = m - match_length = length - end - -- for nodes with same length take the one with earliest start - if match_length and length == smallest_range then - local start = m.start - if start then - local _, _, start_byte = m.start.node:start() - if not earliest_start or start_byte < earliest_start then - smallest_range = m - match_length = length - earliest_start = start_byte - end - end - end - end - end - - if smallest_range then - if smallest_range.start then - local start_range = {smallest_range.start.node:range()} - local node_range = {smallest_range.node:range()} - return bufnr, {start_range[1], start_range[2], node_range[3], node_range[4]}, smallest_range.node - else - return bufnr, {smallest_range.node:range()}, smallest_range.node - end - end -end - -function M.select_textobject(query_string) - local bufnr, textobject = textobject_at_point(query_string) - if textobject then - ts_utils.update_selection(bufnr, textobject) - end -end - -local function get_adjacent(forward, node, query_string, same_parent, overlapping_range_ok, bufnr) - local fn = forward and M.next_textobject or M.previous_textobject - return fn(node, query_string, same_parent, overlapping_range_ok, bufnr) -end - -function M.next_textobject(node, query_string, same_parent, overlapping_range_ok, bufnr) - local node = node or ts_utils.get_node_at_cursor() - local bufnr = bufnr or api.nvim_get_current_buf() - if not node then return end - - local _, _, node_end = node:end_() - local search_start, _ - if overlapping_range_ok then - _, _, search_start = node:start() - else - _, _, search_start = node:end_() - end - local function scoring_function(match) - if match.node == node then return end - if not same_parent or node:parent() == match.node:parent() then - local _, _, start = match.node:start() - local _, _, end_ = match.node:end_() - return start > search_start and end_ >= node_end - end - end - local function filter_function(match) - local _, _, node_start = match.node:start() - return -node_start - end - - local next_node = queries.find_best_match(bufnr, query_string, 'textobjects', scoring_function, filter_function) - - return next_node and next_node.node -end - -function M.previous_textobject(node, query_string, same_parent, overlapping_range_ok, bufnr) - local node = node or ts_utils.get_node_at_cursor() - local bufnr = bufnr or api.nvim_get_current_buf() - if not node then return end - - local _, _, node_start = node:start() - local search_end, _ - if overlapping_range_ok then - _, _, search_end = node:end_() - search_end = search_end + 1 - else - _, _, search_end = node:start() - end - - local function scoring_function(match) - if not same_parent or node:parent() == match.node:parent() then - local _, _, end_ = match.node:end_() - local _, _, start = match.node:start() - return end_ < search_end and start < node_start - end - end - - local function filter_function(match) - local _, _, node_end = match.node:end_() - return node_end - end - - local previous_node = queries.find_best_match(bufnr, query_string, 'textobjects', scoring_function, filter_function) - - return previous_node and previous_node.node -end - -function M.goto_adjacent(query_string, forward, start, same_parent, overlapping_range_ok) - local bufnr, _, node = textobject_at_point(query_string) - local adjacent_textobject = get_adjacent(forward, node, query_string, same_parent, overlapping_range_ok, bufnr) - - if adjacent_textobject then - utils.set_jump() - - local adjacent_textobject_range = {adjacent_textobject:range()} - local position - if start then - position = { adjacent_textobject_range[1] + 1, adjacent_textobject_range[2] } - else - position = { adjacent_textobject_range[3] + 1, adjacent_textobject_range[4] } - end - api.nvim_win_set_cursor(api.nvim_get_current_win(), position) - end -end - -local function swap_textobject(query_string, direction) - local bufnr, textobject_range, node = textobject_at_point(query_string) - if not node then return end - - local step = direction > 0 and 1 or -1 - local overlapping_range_ok = false - local same_parent = true - for _ = 1, math.abs(direction), step do - local forward = direction > 0 - local adjacent_textobject = get_adjacent(forward, node, query_string, same_parent, overlapping_range_ok, bufnr) - ts_utils.swap_nodes(textobject_range, adjacent_textobject, bufnr, "yes, set cursor!") - end -end - -function M.swap_next(query_string) - swap_textobject(query_string, 1) -end - -function M.swap_previous(query_string) - swap_textobject(query_string, -1) -end - - --- luacheck: push ignore 631 -M.goto_next_start = function(query_string) M.goto_adjacent(query_string, 'forward', 'start', not 'same_parent', 'overlap ok') end -M.goto_next_end = function(query_string) M.goto_adjacent(query_string, 'forward', not 'start', not 'same_parent', 'overlap ok') end -M.goto_previous_start = function(query_string) M.goto_adjacent(query_string, not 'forward', 'start', not 'same_parent', 'overlap ok') end -M.goto_previous_end = function(query_string) M.goto_adjacent(query_string, not 'forward', not 'start', not 'same_parent', 'overlap ok') end --- luacheck: pop - -local normal_mode_functions = { "swap_next", - "swap_previous", - "goto_next_start", - "goto_next_end", - "goto_previous_start", - "goto_previous_end"} - -function M.attach(bufnr, lang) - local buf = bufnr or api.nvim_get_current_buf() - local config = configs.get_module("textobjects") - local lang = lang or parsers.get_buf_lang(buf) - - for mapping, query in pairs(config.keymaps) do - if type(query) == 'table' then - query = query[lang] - elseif not queries.get_query(lang, 'textobjects') then - query = nil - end - if query then - local cmd = ":lua require'nvim-treesitter.textobjects'.select_textobject('"..query.."')<CR>" - api.nvim_buf_set_keymap(buf, "o", mapping, cmd, {silent = true, noremap = true }) - api.nvim_buf_set_keymap(buf, "v", mapping, cmd, {silent = true, noremap = true }) - end - end - for _, function_call in pairs(normal_mode_functions) do - for mapping, query in pairs(config[function_call] or {}) do - if type(query) == 'table' then - query = query[lang] - elseif not queries.get_query(lang, 'textobjects') then - query = nil - end - if query then - local cmd = ":lua require'nvim-treesitter.textobjects'."..function_call.."('"..query.."')<CR>" - api.nvim_buf_set_keymap(buf, "n", mapping, cmd, {silent = true, noremap = true }) - end - end - end -end - -function M.detach(bufnr) - local buf = bufnr or api.nvim_get_current_buf() - local config = configs.get_module("textobjects") - local lang = parsers.get_buf_lang(bufnr) - - for mapping, query in pairs(config.keymaps) do - if type(query) == 'table' then - query = query[lang] - elseif not queries.get_query(lang, 'textobjects') then - query = nil - end - if query then - api.nvim_buf_del_keymap(buf, "o", mapping) - api.nvim_buf_del_keymap(buf, "v", mapping) - end - end - for _, function_call in pairs(normal_mode_functions) do - for mapping, query in pairs(config[function_call] or {}) do - if type(query) == 'table' then - query = query[lang] - elseif not queries.get_query(lang, 'textobjects') then - query = nil - end - if query then - api.nvim_buf_del_keymap(buf, "n", mapping) - end - end - end -end - -return M diff --git a/lua/nvim-treesitter/textobjects/attach.lua b/lua/nvim-treesitter/textobjects/attach.lua new file mode 100644 index 000000000..22d6b650d --- /dev/null +++ b/lua/nvim-treesitter/textobjects/attach.lua @@ -0,0 +1,61 @@ +local configs = require'nvim-treesitter.configs' +local parsers = require'nvim-treesitter.parsers' +local queries = require'nvim-treesitter.query' +local api = vim.api +local M = {} + +function M.make_attach(normal_mode_functions, submodule) + return function(bufnr, lang) + local buf = bufnr or api.nvim_get_current_buf() + local config = configs.get_module("textobjects."..submodule) + local lang = lang or parsers.get_buf_lang(buf) + + for _, function_call in pairs(normal_mode_functions) do + for mapping, query in pairs(config[function_call] or {}) do + if type(query) == 'table' then + query = query[lang] + elseif not queries.get_query(lang, 'textobjects') then + query = nil + end + if query then + local cmd = ":lua require'nvim-treesitter.textobjects."..submodule.."'."..function_call.."('"..query.."')<CR>" + api.nvim_buf_set_keymap(buf, "n", mapping, cmd, {silent = true, noremap = true }) + end + end + end + end +end + +function M.make_detach(normal_mode_functions, submodule) + return function(bufnr) + local buf = bufnr or api.nvim_get_current_buf() + local config = configs.get_module("textobjects."..submodule) + local lang = parsers.get_buf_lang(bufnr) + + for mapping, query in pairs(config.keymaps) do + if type(query) == 'table' then + query = query[lang] + elseif not queries.get_query(lang, 'textobjects') then + query = nil + end + if query then + api.nvim_buf_del_keymap(buf, "o", mapping) + api.nvim_buf_del_keymap(buf, "v", mapping) + end + end + for _, function_call in pairs(normal_mode_functions) do + for mapping, query in pairs(config[function_call] or {}) do + if type(query) == 'table' then + query = query[lang] + elseif not queries.get_query(lang, 'textobjects') then + query = nil + end + if query then + api.nvim_buf_del_keymap(buf, "n", mapping) + end + end + end + end +end + +return M diff --git a/lua/nvim-treesitter/textobjects/move.lua b/lua/nvim-treesitter/textobjects/move.lua new file mode 100644 index 000000000..8cfb71188 --- /dev/null +++ b/lua/nvim-treesitter/textobjects/move.lua @@ -0,0 +1,41 @@ +local utils = require'nvim-treesitter.utils' +local shared = require'nvim-treesitter.textobjects.shared' +local attach = require'nvim-treesitter.textobjects.attach' +local api = vim.api + +local M = {} + +function M.goto_adjacent(query_string, forward, start, same_parent, overlapping_range_ok) + local bufnr, _, node = shared.textobject_at_point(query_string) + local adjacent = shared.get_adjacent(forward, node, query_string, same_parent, overlapping_range_ok, bufnr) + + if adjacent then + utils.set_jump() + + local adjacent_textobject_range = {adjacent:range()} + local position + if start then + position = { adjacent_textobject_range[1] + 1, adjacent_textobject_range[2] } + else + position = { adjacent_textobject_range[3] + 1, adjacent_textobject_range[4] } + end + api.nvim_win_set_cursor(api.nvim_get_current_win(), position) + end +end + +-- luacheck: push ignore 631 +M.goto_next_start = function(query_string) M.goto_adjacent(query_string, 'forward', 'start', not 'same_parent', 'overlap ok') end +M.goto_next_end = function(query_string) M.goto_adjacent(query_string, 'forward', not 'start', not 'same_parent', 'overlap ok') end +M.goto_previous_start = function(query_string) M.goto_adjacent(query_string, not 'forward', 'start', not 'same_parent', 'overlap ok') end +M.goto_previous_end = function(query_string) M.goto_adjacent(query_string, not 'forward', not 'start', not 'same_parent', 'overlap ok') end +-- luacheck: pop + +local normal_mode_functions = {"goto_next_start", + "goto_next_end", + "goto_previous_start", + "goto_previous_end"} + +M.attach = attach.make_attach(normal_mode_functions, "move") +M.deattach = attach.make_detach(normal_mode_functions, "move") + +return M diff --git a/lua/nvim-treesitter/textobjects/select.lua b/lua/nvim-treesitter/textobjects/select.lua new file mode 100644 index 000000000..1f3698bc4 --- /dev/null +++ b/lua/nvim-treesitter/textobjects/select.lua @@ -0,0 +1,55 @@ +local api = vim.api +local configs = require'nvim-treesitter.configs' +local parsers = require'nvim-treesitter.parsers' +local queries = require'nvim-treesitter.query' + +local shared = require'nvim-treesitter.textobjects.shared' +local ts_utils = require'nvim-treesitter.ts_utils' + +local M = {} + +function M.select_textobject(query_string) + local bufnr, textobject = shared.textobject_at_point(query_string) + if textobject then + ts_utils.update_selection(bufnr, textobject) + end +end + +function M.attach(bufnr, lang) + local buf = bufnr or api.nvim_get_current_buf() + local config = configs.get_module("textobjects.select") + local lang = lang or parsers.get_buf_lang(buf) + + for mapping, query in pairs(config.keymaps) do + if type(query) == 'table' then + query = query[lang] + elseif not queries.get_query(lang, 'textobjects') then + query = nil + end + if query then + local cmd = ":lua require'nvim-treesitter.textobjects.select'.select_textobject('"..query.."')<CR>" + api.nvim_buf_set_keymap(buf, "o", mapping, cmd, {silent = true, noremap = true }) + api.nvim_buf_set_keymap(buf, "v", mapping, cmd, {silent = true, noremap = true }) + end + end +end + +function M.detach(bufnr) + local buf = bufnr or api.nvim_get_current_buf() + local config = configs.get_module("textobjects.select") + local lang = parsers.get_buf_lang(bufnr) + + for mapping, query in pairs(config.keymaps) do + if type(query) == 'table' then + query = query[lang] + elseif not queries.get_query(lang, 'textobjects') then + query = nil + end + if query then + api.nvim_buf_del_keymap(buf, "o", mapping) + api.nvim_buf_del_keymap(buf, "v", mapping) + end + end +end + +return M diff --git a/lua/nvim-treesitter/textobjects/shared.lua b/lua/nvim-treesitter/textobjects/shared.lua new file mode 100644 index 000000000..3a00da427 --- /dev/null +++ b/lua/nvim-treesitter/textobjects/shared.lua @@ -0,0 +1,142 @@ +local api = vim.api +local ts = vim.treesitter + +local parsers = require "nvim-treesitter.parsers" +local queries = require'nvim-treesitter.query' +local ts_utils = require'nvim-treesitter.ts_utils' + +local M = {} + +function M.textobject_at_point(query_string) + local bufnr = vim.api.nvim_get_current_buf() + local lang = parsers.get_buf_lang(bufnr) + if not lang then return end + + local row, col = unpack(vim.api.nvim_win_get_cursor(0)) + row = row - 1 + + local matches = {} + + if string.match(query_string, '^@.*') then + matches = queries.get_capture_matches(bufnr, query_string, 'textobjects') + else + local parser = parsers.get_parser(bufnr, lang) + local root = parser:parse():root() + + local start_row, _, end_row, _ = root:range() + + local query = ts.parse_query(lang, query_string) + for m in queries.iter_prepared_matches(query, root, bufnr, start_row, end_row) do + for _, n in pairs(m) do + if n.node then + table.insert(matches, n) + end + end + end + end + + local match_length + local smallest_range + local earliest_start + + for _, m in pairs(matches) do + if m.node and ts_utils.is_in_node_range(m.node, row, col) then + local length = ts_utils.node_length(m.node) + if not match_length or length < match_length then + smallest_range = m + match_length = length + end + -- for nodes with same length take the one with earliest start + if match_length and length == smallest_range then + local start = m.start + if start then + local _, _, start_byte = m.start.node:start() + if not earliest_start or start_byte < earliest_start then + smallest_range = m + match_length = length + earliest_start = start_byte + end + end + end + end + end + + if smallest_range then + if smallest_range.start then + local start_range = {smallest_range.start.node:range()} + local node_range = {smallest_range.node:range()} + return bufnr, {start_range[1], start_range[2], node_range[3], node_range[4]}, smallest_range.node + else + return bufnr, {smallest_range.node:range()}, smallest_range.node + end + end +end + +function M.get_adjacent(forward, node, query_string, same_parent, overlapping_range_ok, bufnr) + local fn = forward and M.next_textobject or M.previous_textobject + return fn(node, query_string, same_parent, overlapping_range_ok, bufnr) +end + +function M.next_textobject(node, query_string, same_parent, overlapping_range_ok, bufnr) + local node = node or ts_utils.get_node_at_cursor() + local bufnr = bufnr or api.nvim_get_current_buf() + if not node then return end + + local _, _, node_end = node:end_() + local search_start, _ + if overlapping_range_ok then + _, _, search_start = node:start() + else + _, _, search_start = node:end_() + end + local function scoring_function(match) + if match.node == node then return end + if not same_parent or node:parent() == match.node:parent() then + local _, _, start = match.node:start() + local _, _, end_ = match.node:end_() + return start > search_start and end_ >= node_end + end + end + local function filter_function(match) + local _, _, node_start = match.node:start() + return -node_start + end + + local next_node = queries.find_best_match(bufnr, query_string, 'textobjects', scoring_function, filter_function) + + return next_node and next_node.node +end + +function M.previous_textobject(node, query_string, same_parent, overlapping_range_ok, bufnr) + local node = node or ts_utils.get_node_at_cursor() + local bufnr = bufnr or api.nvim_get_current_buf() + if not node then return end + + local _, _, node_start = node:start() + local search_end, _ + if overlapping_range_ok then + _, _, search_end = node:end_() + search_end = search_end + 1 + else + _, _, search_end = node:start() + end + + local function scoring_function(match) + if not same_parent or node:parent() == match.node:parent() then + local _, _, end_ = match.node:end_() + local _, _, start = match.node:start() + return end_ < search_end and start < node_start + end + end + + local function filter_function(match) + local _, _, node_end = match.node:end_() + return node_end + end + + local previous_node = queries.find_best_match(bufnr, query_string, 'textobjects', scoring_function, filter_function) + + return previous_node and previous_node.node +end + +return M diff --git a/lua/nvim-treesitter/textobjects/swap.lua b/lua/nvim-treesitter/textobjects/swap.lua new file mode 100644 index 000000000..bb681fdd0 --- /dev/null +++ b/lua/nvim-treesitter/textobjects/swap.lua @@ -0,0 +1,35 @@ +local ts_utils = require'nvim-treesitter.ts_utils' +local shared = require'nvim-treesitter.textobjects.shared' +local attach = require'nvim-treesitter.textobjects.attach' + +local M = {} + +local function swap_textobject(query_string, direction) + local bufnr, textobject_range, node = shared.textobject_at_point(query_string) + if not node then return end + + local step = direction > 0 and 1 or -1 + local overlapping_range_ok = false + local same_parent = true + for _ = 1, math.abs(direction), step do + local forward = direction > 0 + local adjacent = shared.get_adjacent(forward, node, query_string, same_parent, overlapping_range_ok, bufnr) + ts_utils.swap_nodes(textobject_range, adjacent, bufnr, "yes, set cursor!") + end +end + +function M.swap_next(query_string) + swap_textobject(query_string, 1) +end + +function M.swap_previous(query_string) + swap_textobject(query_string, -1) +end + +local normal_mode_functions = {"swap_next", + "swap_previous"} + +M.attach = attach.make_attach(normal_mode_functions, "swap") +M.deattach = attach.make_detach(normal_mode_functions, "swap") + +return M |