提交: adef1bf66b7076f04818738fef3fd21a7b53d965 - vim (git)

Commit MetaInfo

• 修订版: adef1bf66b7076f04818738fef3fd21a7b53d965 (tree)
• 时间: 2023-05-05 19:01:14
• 作者: Markus Prepens <markus.prepens@gmai...>
• Commiter: Markus Prepens

Log Message

RgFiles accepts 2nd parameter

更改概述

• modified: autoload/run.vim
• modified: plugin/ripgrep.vim

差异

--- a/autoload/run.vim
+++ b/autoload/run.vim
@@ -118,10 +118,12 @@ export def CloseCb(ch: channel)
                 popup_create(done_str, g:WinoptsDone())
             else
                 var b = bufadd(d.name)
+                lines = getbufinfo(b)[0].linecount
                 execute "drop" d.name
-                setline(line("$") + 1, [d.full_cmd] + getbufline(d.bufnr, 1, "$"))
-                setlocal buftype=nofile nomodified
-
+                setlocal noreadonly
+                setline(lines + 1, ['# ' .. d.full_cmd] + getbufline(d.bufnr, 1, "$"))
+                setlocal buftype=nofile nomodified readonly
+                setpos(".", [b, lines + 1, 0, 0])
             endif
 
             execute "silent bwipe" d.bufnr

--- a/plugin/ripgrep.vim
+++ b/plugin/ripgrep.vim
@@ -2,12 +2,12 @@ vim9script
 # Vim plugin FIF - find in files
 # Description: Some minor extensions to run ripgrep or Windows own findstr.
 
-import autoload "run.vim"
-
 if !executable("rg")
     finish
 endif
 
+import autoload "run.vim"
+
 g:rg_glob_patterns = {
     c: '-g *.c -g *.h -g *.850 -g *.s',
     cpp: '-tcpp -tc',
@@ -43,10 +43,10 @@ enddef
 set grepprg=rg\ --vimgrep\ $*
 set grepformat=%f:%l:%c:%m
 
-command! -complete=file -nargs=* RgFiles run.RunStart({cmd: "rg --files" .. g:RgGlobSwitch() .. join(split('<args>', " "), g:RgGlobSwitch() ), name: "RgFiles"})
+command! -complete=file -nargs=* RgFiles run.RunStart({cmd: "rg --files" .. g:RgGlobSwitch() .. ' <args>', name: "RgFiles"})
 command! -complete=file -nargs=* Rg      run.RunStart({cmd: 'rg --vimgrep ' .. ' <args> ' .. join(g:rg_paths, " "), regexp: &grepformat, no_popup: true})
 
-nnoremap <Leader>F :RgFiles **<Left>
+nnoremap <Leader>F :RgFiles ** .<Left><Left><Left>
 nnoremap <Leader>R :Rg <C-r>=g:RgExcludes()<CR> <C-r>=RgIncludes(&ft)<CR> <C-r>=RgPattern()<CR>
 nnoremap <silent> <Leader>r :Rg <C-r>=g:RgExcludes()<CR> <C-r>=RgIncludes(&ft)<CR> <C-r>=RgPattern()<CR><CR>