From 378d9135e7ac0f91a4944be816dc9f693d5078af Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 28 Oct 2024 15:14:15 +0800
Subject: vim-patch:9.1.0810: cannot easily adjust the |:find| command

Problem:  cannot easily adjust the |:find| command
Solution: Add support for the 'findexpr' option (Yegappan Lakshmanan)

closes: vim/vim#15901
closes: vim/vim#15905

https://github.com/vim/vim/commit/aeb1c97db5b9de4f4903e7f288f2aa5ad6c49440

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 src/nvim/options.lua | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

(limited to 'src/nvim/options.lua')

diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index a891d18364..65401fb3a9 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -2905,6 +2905,59 @@ return {
       type = 'string',
       varname = 'p_fcs',
     },
+    {
+      abbreviation = 'fexpr',
+      cb = 'did_set_optexpr',
+      defaults = { if_true = '' },
+      desc = [=[
+        Expression that is evaluated to obtain the filename(s) for the |:find|
+        command.  When this option is empty, the internal |file-searching|
+        mechanism is used.
+
+        While evaluating the expression, the |v:fname| variable is set to the
+        argument of the |:find| command.
+
+        The expression is evaluated only once per |:find| command invocation.
+        The expression can process all the directories specified in 'path'.
+
+        If a match is found, the expression should return a |List| containing
+        one or more file names.  If a match is not found, the expression
+        should return an empty List.
+
+        If any errors are encountered during the expression evaluation, an
+        empty List is used as the return value.
+
+        Using a function call without arguments is faster |expr-option-function|
+
+        It is not allowed to change text or jump to another window while
+        evaluating 'findexpr' |textlock|.
+
+        This option cannot be set from a |modeline| or in the |sandbox|, for
+        security reasons.
+
+        Examples:
+        >vim
+            " Use glob()
+            func FindExprGlob()
+        	return glob(v:fname, v:false, v:true)
+            endfunc
+            set findexpr=FindExprGlob()
+
+            " Use the 'git ls-files' output
+            func FindGitFiles()
+        	let fnames = systemlist('git ls-files')
+        	return fnames->filter('v:val =~? v:fname')
+            endfunc
+            set findexpr=FindGitFiles()
+        <
+      ]=],
+      full_name = 'findexpr',
+      scope = { 'global', 'buffer' },
+      secure = true,
+      short_desc = N_('expression used for :find'),
+      type = 'string',
+      varname = 'p_fexpr',
+    },
     {
       abbreviation = 'fixeol',
       cb = 'did_set_eof_eol_fixeol_bomb',
-- 
cgit 


From 6b8c3d146ec0308fd19a9142b23b5e342e2cdcf8 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 28 Oct 2024 16:09:39 +0800
Subject: vim-patch:9.1.0811: :find expansion does not consider 'findexpr'

Problem:  :find expansion does not consider 'findexpr'
Solution: Support expanding :find command argument using 'findexpr'
          (Yegappan Lakshmanan)

closes: vim/vim#15929

https://github.com/vim/vim/commit/2f6efaccfd5c4e7df1f54ed0f41f329abbe05f60

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 src/nvim/options.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/nvim/options.lua')

diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 65401fb3a9..2e037d80d3 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -2955,6 +2955,7 @@ return {
       scope = { 'global', 'buffer' },
       secure = true,
       short_desc = N_('expression used for :find'),
+      tags = { 'E1514' },
       type = 'string',
       varname = 'p_fexpr',
     },
-- 
cgit 


From 60b3ccd850ca038af6fc0a19cad12578f63d67ec Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 29 Oct 2024 07:02:04 +0800
Subject: vim-patch:9.1.0821: 'findexpr' completion doesn't set v:fname to
 cmdline argument

Problem:  'findexpr' completion doesn't set v:fname to cmdline argument.
Solution: Set v:fname to the cmdline argument as-is (zeertzjq).

closes: vim/vim#15934

https://github.com/vim/vim/commit/20e045f78148c0ef0143c33ffe686fee72d29376
---
 src/nvim/options.lua | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/nvim/options.lua')

diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 2e037d80d3..d59958eaf2 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -2920,6 +2920,10 @@ return {
         The expression is evaluated only once per |:find| command invocation.
         The expression can process all the directories specified in 'path'.
 
+        The expression may be evaluated for command-line completion as well,
+        in which case the |v:cmdcomplete| variable will be set to |v:true|,
+        otherwise it will be set to |v:false|.
+
         If a match is found, the expression should return a |List| containing
         one or more file names.  If a match is not found, the expression
         should return an empty List.
@@ -2939,7 +2943,8 @@ return {
         >vim
             " Use glob()
             func FindExprGlob()
-        	return glob(v:fname, v:false, v:true)
+        	let pat = v:cmdcomplete ? $'{v:fname}*' : v:fname
+        	return glob(pat, v:false, v:true)
             endfunc
             set findexpr=FindExprGlob()
 
-- 
cgit