perf(config): migrate to provider decorators (#469)

linrongbin16 · Dec 8, 2023 · f825f32 · f825f32
1 parent 32599cd
commit f825f32
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 68 deletions.
diff --git a/bin/general/provider.lua b/bin/general/provider.lua
@@ -77,9 +77,6 @@ if metaopts.provider_decorator ~= nil then
     vim.inspect(metaopts.provider_decorator)
   )
   local module_name = metaopts.provider_decorator.module
-  if metaopts.provider_decorator.builtin then
-    module_name = "fzfx.helper.provider_decorators." .. module_name
-  end
   local ok, module_or_err = pcall(require, module_name)
   shell_helpers.log_ensure(
     ok and tbls.tbl_not_empty(module_or_err),

diff --git a/lua/fzfx/cfg/buffers.lua b/lua/fzfx/cfg/buffers.lua
@@ -114,7 +114,7 @@ M.providers = {
   key = "default",
   provider = M._buffers_provider,
   provider_type = ProviderTypeEnum.LIST,
-  line_opts = { prepend_icon_by_ft = true },
+  provider_decorator = { module = "prepend_icon_find", builtin = true },
 }
 
 M.previewers = {

diff --git a/lua/fzfx/cfg/git_files.lua b/lua/fzfx/cfg/git_files.lua
@@ -151,13 +151,13 @@ M.providers = {
     key = "ctrl-u",
     provider = current_folder_provider,
     provider_type = ProviderTypeEnum.COMMAND_LIST,
-    line_opts = { prepend_icon_by_ft = true },
+    provider_decorator = { module = "prepend_icon_find", builtin = true },
   },
   workspace = {
     key = "ctrl-w",
     provider = workspace_provider,
     provider_type = ProviderTypeEnum.COMMAND_LIST,
-    line_opts = { prepend_icon_by_ft = true },
+    provider_decorator = { module = "prepend_icon_find", builtin = true },
   },
 }
 

diff --git a/lua/fzfx/cfg/git_live_grep.lua b/lua/fzfx/cfg/git_live_grep.lua
@@ -103,11 +103,7 @@ M.providers = {
   key = "default",
   provider = M._git_live_grep_provider,
   provider_type = ProviderTypeEnum.COMMAND_LIST,
-  line_opts = {
-    prepend_icon_by_ft = true,
-    prepend_icon_path_delimiter = ":",
-    prepend_icon_path_position = 1,
-  },
+  provider_decorator = { module = "prepend_icon_grep", builtin = true },
 }
 
 M.previewers = {

diff --git a/lua/fzfx/cfg/live_grep.lua b/lua/fzfx/cfg/live_grep.lua
@@ -297,31 +297,19 @@ M.providers = {
     key = "ctrl-r",
     provider = restricted_provider,
     provider_type = ProviderTypeEnum.COMMAND_LIST,
-    line_opts = {
-      prepend_icon_by_ft = true,
-      prepend_icon_path_delimiter = ":",
-      prepend_icon_path_position = 1,
-    },
+    provider_decorator = { module = "prepend_icon_grep", builtin = true },
   },
   unrestricted_mode = {
     key = "ctrl-u",
     provider = unrestricted_provider,
     provider_type = ProviderTypeEnum.COMMAND_LIST,
-    line_opts = {
-      prepend_icon_by_ft = true,
-      prepend_icon_path_delimiter = ":",
-      prepend_icon_path_position = 1,
-    },
+    provider_decorator = { module = "prepend_icon_grep", builtin = true },
   },
   buffer_mode = {
     key = "ctrl-o",
     provider = buffer_provider,
     provider_type = ProviderTypeEnum.COMMAND_LIST,
-    line_opts = {
-      prepend_icon_by_ft = true,
-      prepend_icon_path_delimiter = ":",
-      prepend_icon_path_position = 1,
-    },
+    provider_decorator = { module = "prepend_icon_grep", builtin = true },
   },
 }
 

diff --git a/lua/fzfx/cfg/lsp_definitions.lua b/lua/fzfx/cfg/lsp_definitions.lua
@@ -41,11 +41,7 @@ M.providers = {
     capability = "definitionProvider",
   }),
   provider_type = ProviderTypeEnum.LIST,
-  line_opts = {
-    prepend_icon_by_ft = true,
-    prepend_icon_path_delimiter = ":",
-    prepend_icon_path_position = 1,
-  },
+  provider_decorator = { module = "prepend_icon_grep", builtin = true },
 }
 
 M.fzf_opts = {

diff --git a/lua/fzfx/cfg/lsp_diagnostics.lua b/lua/fzfx/cfg/lsp_diagnostics.lua
@@ -288,21 +288,13 @@ M.providers = {
     key = "ctrl-w",
     provider = M._make_lsp_diagnostics_provider(),
     provider_type = ProviderTypeEnum.LIST,
-    line_opts = {
-      prepend_icon_by_ft = true,
-      prepend_icon_path_delimiter = ":",
-      prepend_icon_path_position = 1,
-    },
+    provider_decorator = { module = "prepend_icon_grep", builtin = true },
   },
   buffer_diagnostics = {
     key = "ctrl-u",
     provider = M._make_lsp_diagnostics_provider({ buffer = true }),
     provider_type = ProviderTypeEnum.LIST,
-    line_opts = {
-      prepend_icon_by_ft = true,
-      prepend_icon_path_delimiter = ":",
-      prepend_icon_path_position = 1,
-    },
+    provider_decorator = { module = "prepend_icon_grep", builtin = true },
   },
 }
 

diff --git a/lua/fzfx/cfg/lsp_implementations.lua b/lua/fzfx/cfg/lsp_implementations.lua
@@ -40,11 +40,7 @@ M.providers = {
     capability = "implementationProvider",
   }),
   provider_type = ProviderTypeEnum.LIST,
-  line_opts = {
-    prepend_icon_by_ft = true,
-    prepend_icon_path_delimiter = ":",
-    prepend_icon_path_position = 1,
-  },
+  provider_decorator = { module = "prepend_icon_grep", builtin = true },
 }
 
 M.previewers = _lsp_locations.previewers

diff --git a/lua/fzfx/cfg/lsp_incoming_calls.lua b/lua/fzfx/cfg/lsp_incoming_calls.lua
@@ -40,11 +40,7 @@ M.providers = {
     capability = "callHierarchyProvider",
   }),
   provider_type = ProviderTypeEnum.LIST,
-  line_opts = {
-    prepend_icon_by_ft = true,
-    prepend_icon_path_delimiter = ":",
-    prepend_icon_path_position = 1,
-  },
+  provider_decorator = { module = "prepend_icon_grep", builtin = true },
 }
 
 M.fzf_opts = {

diff --git a/lua/fzfx/cfg/lsp_outgoing_calls.lua b/lua/fzfx/cfg/lsp_outgoing_calls.lua
@@ -40,11 +40,7 @@ M.providers = {
     capability = "callHierarchyProvider",
   }),
   provider_type = ProviderTypeEnum.LIST,
-  line_opts = {
-    prepend_icon_by_ft = true,
-    prepend_icon_path_delimiter = ":",
-    prepend_icon_path_position = 1,
-  },
+  provider_decorator = { module = "prepend_icon_grep", builtin = true },
 }
 
 M.previewers = _lsp_locations.previewers

diff --git a/lua/fzfx/cfg/lsp_references.lua b/lua/fzfx/cfg/lsp_references.lua
@@ -40,11 +40,7 @@ M.providers = {
     capability = "referencesProvider",
   }),
   provider_type = ProviderTypeEnum.LIST,
-  line_opts = {
-    prepend_icon_by_ft = true,
-    prepend_icon_path_delimiter = ":",
-    prepend_icon_path_position = 1,
-  },
+  provider_decorator = { module = "prepend_icon_grep", builtin = true },
 }
 
 M.fzf_opts = {

diff --git a/lua/fzfx/cfg/lsp_type_definitions.lua b/lua/fzfx/cfg/lsp_type_definitions.lua
@@ -40,11 +40,7 @@ M.providers = {
     capability = "typeDefinitionProvider",
   }),
   provider_type = ProviderTypeEnum.LIST,
-  line_opts = {
-    prepend_icon_by_ft = true,
-    prepend_icon_path_delimiter = ":",
-    prepend_icon_path_position = 1,
-  },
+  provider_decorator = { module = "prepend_icon_grep", builtin = true },
 }
 
 M.fzf_opts = {

diff --git a/lua/fzfx/detail/general.lua b/lua/fzfx/detail/general.lua
@@ -96,7 +96,11 @@ local function make_provider_meta_opts(pipeline, provider_config)
 
   -- provider_decorator
   if tbls.tbl_get(provider_config, "provider_decorator") then
-    o.provider_decorator = provider_config.provider_decorator
+    o.provider_decorator = vim.deepcopy(provider_config.provider_decorator)
+    if o.provider_decorator.builtin then
+      o.provider_decorator.module = "fzfx.helper.provider_decorators."
+        .. o.provider_decorator.module
+    end
   end
 
   return o

diff --git a/lua/fzfx/schema.lua b/lua/fzfx/schema.lua
@@ -31,7 +31,7 @@ local ProviderTypeEnum = {
 -- ========== Provider Decorator ==========
 --
 --- @alias fzfx._FunctionProviderDecorator fun(line:string?):string?
---- @alias fzfx.ProviderDecorator string|{module:string,rtp:string?,builtin:boolean?}
+--- @alias fzfx.ProviderDecorator {module:string,rtp:string?,builtin:boolean?}
 --
 -- Note: in `fzfx._FunctionProviderDecorator`, the 1st parameter `line` is the raw generated line from providers.
 --