From 84317a6878e44eb5c12b671ddaf0297823a35db9 Mon Sep 17 00:00:00 2001 From: linrongbin16 Date: Thu, 20 Jun 2024 11:36:03 +0800 Subject: [PATCH] chore --- lua/fzfx/cfg/vim_keymaps.lua | 14 +++++++------- spec/cfg/vim_keymaps_spec.lua | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lua/fzfx/cfg/vim_keymaps.lua b/lua/fzfx/cfg/vim_keymaps.lua index 84ef40b19..242ff665b 100644 --- a/lua/fzfx/cfg/vim_keymaps.lua +++ b/lua/fzfx/cfg/vim_keymaps.lua @@ -229,7 +229,7 @@ end --- @param output_lines string[] --- @return fzfx.VimKeyMap[] -M._get_vim_keymaps = function(output_lines) +M._get_keymaps = function(output_lines) local LAST_SET_FROM = "\tLast set from " local LAST_SET_FROM_LUA = "\tLast set from Lua" local LINE = " line " @@ -260,12 +260,12 @@ M._get_vim_keymaps = function(output_lines) end -- log.debug( - -- "|fzfx.config - _get_vim_keymaps| keys_output_map1:%s", + -- "|_get_keymaps| keys_output_map1:%s", -- vim.inspect(keys_output_map) -- ) local api_keymaps = vim.api.nvim_get_keymap("") --[[@as table]] -- log.debug( - -- "|fzfx.config - _get_vim_keymaps| api_keys_list:%s", + -- "|_get_keymaps| api_keys_list:%s", -- vim.inspect(api_keys_list) -- ) local api_maps = {} @@ -330,7 +330,7 @@ M._get_vim_keymaps = function(output_lines) end end - log.debug(string.format("|_get_vim_keymaps| keys_output_map2:%s", vim.inspect(output_maps))) + log.debug(string.format("|_get_keymaps| keys_output_map2:%s", vim.inspect(output_maps))) local sorted_results = {} for _, o in pairs(output_maps) do table.insert(sorted_results, o) @@ -338,7 +338,7 @@ M._get_vim_keymaps = function(output_lines) table.sort(sorted_results, function(a, b) return a.lhs < b.lhs end) - log.debug(string.format("|_get_vim_keymaps| results:%s", vim.inspect(sorted_results))) + log.debug(string.format("|_get_keymaps| results:%s", vim.inspect(sorted_results))) return sorted_results end @@ -451,7 +451,7 @@ M._make_provider = function(mode) --- @param context fzfx.VimKeyMapsPipelineContext --- @return string[]|nil local function impl(query, context) - local keymaps = M._get_vim_keymaps(context.output_lines) + local keymaps = M._get_keymaps(context.output_lines) local target_keymaps = {} if mode == "a" then target_keymaps = keymaps @@ -589,7 +589,7 @@ M._context_maker = function() } ctx.output_lines = M._get_maps_output_in_lines() - local keymaps = M._get_vim_keymaps(ctx.output_lines) + local keymaps = M._get_keymaps(ctx.output_lines) local key_column_width, opts_column_width = M._calculate_columns_widths(keymaps) ctx.key_column_width = key_column_width ctx.opts_column_width = opts_column_width diff --git a/spec/cfg/vim_keymaps_spec.lua b/spec/cfg/vim_keymaps_spec.lua index 786d2cab3..c8fa3e3cf 100644 --- a/spec/cfg/vim_keymaps_spec.lua +++ b/spec/cfg/vim_keymaps_spec.lua @@ -95,8 +95,8 @@ describe("fzfx.cfg.vim_keymaps", function() end end end) - it("_get_vim_keymaps", function() - local actual = vim_keymaps_cfg._get_vim_keymaps(CONTEXT.output_lines) + it("_get_keymaps", function() + local actual = vim_keymaps_cfg._get_keymaps(CONTEXT.output_lines) -- print(string.format("vim keymaps:%s\n", vim.inspect(actual))) assert_eq(type(actual), "table") assert_true(#actual >= 0) @@ -133,7 +133,7 @@ describe("fzfx.cfg.vim_keymaps", function() assert_eq(actual2, string.len("Mode|Noremap|Nowait|Silent")) end) it("_render_lines", function() - local keymaps = vim_keymaps_cfg._get_vim_keymaps(CONTEXT.output_lines) + local keymaps = vim_keymaps_cfg._get_keymaps(CONTEXT.output_lines) local lhs_width, opts_width = vim_keymaps_cfg._calculate_columns_widths(keymaps) local actual = vim_keymaps_cfg._render_lines(keymaps, lhs_width, opts_width) -- print(string.format("render vim keymaps:%s\n", vim.inspect(actual)))