From 19af99011a9685dd364d08b8adaffa791ccd7dc3 Mon Sep 17 00:00:00 2001 From: windwp Date: Thu, 9 Sep 2021 10:35:38 +0700 Subject: [PATCH] refactor: test file with setup_func --- lua/nvim-autopairs.lua | 2 +- tests/nvim-autopairs_spec.lua | 53 ++++++++++++++++++++--------------- 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/lua/nvim-autopairs.lua b/lua/nvim-autopairs.lua index ab32fe2..484f3dc 100644 --- a/lua/nvim-autopairs.lua +++ b/lua/nvim-autopairs.lua @@ -345,7 +345,7 @@ M.autopairs_map = function(bufnr, char) new_text = line:sub(1, col) .. line:sub(col + 1, #line) add_char = 0 elseif rule.key_map and rule.key_map:match("<.*>") then - -- if it is a special key liek + -- if it is a special key like if utils.esc(rule.key_map) ~= char then new_text = '' else diff --git a/tests/nvim-autopairs_spec.lua b/tests/nvim-autopairs_spec.lua index 4fd3abf..ea7f646 100644 --- a/tests/nvim-autopairs_spec.lua +++ b/tests/nvim-autopairs_spec.lua @@ -10,24 +10,6 @@ _G.npairs = npairs; local eq=_G.eq -npairs.add_rules({ - Rule("u%d%d%d%d$", "number", "lua") - :use_regex(true), - Rule("x%d%d%d%d$", "number", "lua") - :use_regex(true) - :replace_endpair(function(opts) - log.debug(opts.prev_char) - return opts.prev_char:sub(#opts.prev_char - 3,#opts.prev_char) - end), - Rule("b%d%d%d%d%w$", "", "vim") - :use_regex(true,"") - :replace_endpair(function(opts) - return - opts.prev_char:sub(#opts.prev_char - 4,#opts.prev_char) - .."viwUi" - end), - -}) vim.api.nvim_set_keymap('i' , '','v:lua.npairs.check_break_line_char()', {expr = true , noremap = true}) function helpers.feed(text, feed_opts, is_replace) feed_opts = feed_opts or 'n' @@ -265,21 +247,41 @@ local data = { after = [[a((((|)))) ]] }, { - name="text regex", + setup_func = function() + npairs.add_rules({ + Rule('u%d%d%d%d$', 'number', 'lua'):use_regex(true), + }) + end, + name = "text regex", filetype = "lua", key="4", before = [[u123| ]], after = [[u1234|number ]] }, { - name="text regex with custome end_pair", + + setup_func = function () + npairs.add_rules({ + Rule('x%d%d%d%d$', 'number', 'lua'):use_regex(true):replace_endpair(function(opts) + return opts.prev_char:sub(#opts.prev_char - 3, #opts.prev_char) + end), + }) + end, + name = "text regex with custom end_pair", filetype = "lua", - key="4", + key = "4", before = [[x123| ]], after = [[x1234|1234 ]] }, { - name="text regex with custome key", + setup_func = function () + npairs.add_rules({ + Rule('b%d%d%d%d%w$', '', 'vim'):use_regex(true, ''):replace_endpair(function(opts) + return opts.prev_char:sub(#opts.prev_char - 4, #opts.prev_char) .. 'viwUi' + end), + }) + end, + name="text regex with custom key", filetype = "vim", key="", before = [[b1234s| ]], @@ -287,6 +289,13 @@ local data = { }, { + setup_func = function () + npairs.add_rules({ + Rule('b%d%d%d%d%w$', '', 'vim'):use_regex(true, ''):replace_endpair(function(opts) + return opts.prev_char:sub(#opts.prev_char - 4, #opts.prev_char) .. 'viwUi' + end), + }) + end, name="test move right custom char", filetype="vim", key="",