コミット: cb615394967242bfade75197de95fd14c07f2aed - vim (git)

コミットメタ情報

• リビジョン: cb615394967242bfade75197de95fd14c07f2aed (tree)
• 日時: 2023-02-27 01:41:38
• 作者: badcoff33 <none@none>
• コミッター: badcoff33

ログメッセージ

updates

変更サマリ

• modified: autoload/run.vim
• modified: autoload/torchlight.vim
• modified: plugin/hg.vim
• modified: plugin/ripgrep.vim
• modified: plugin/torchlight.vim
• modified: templates/local_vimrc
• modified: vimrc

差分

--- a/autoload/run.vim
+++ b/autoload/run.vim
@@ -44,9 +44,13 @@ export def CloseCb(ch: channel)
     for d in g:run_dict
         if d.channel == ch_nr
 
-            timer_stop(d.timer)
+            if has_key(d, "timer")
+                timer_stop(d.timer)
+            endif
             g:run_2_tid = timer_start(500, (_) => {
-                popup_close(d.winid)
+                if has_key(d, "winid")
+                    popup_close(d.winid)
+                endif
                 RemoveChannelFromDict(d.channel)
             }, {repeat: 1})
 
@@ -86,7 +90,9 @@ export def HiddenErrorCb(ch: channel,  msg: string)
     for d in g:run_dict
         if d.channel == ch_nr
             timer_stop(d.timer)
-            popup_close(d.winid)
+            if has_key(d, "winid")
+                popup_close(d.winid)
+            endif
             echohl ErrorMsg
             echo "error reported by channel" ch_info(ch)["id"] "-->" msg
             echohl None
@@ -110,21 +116,23 @@ def ConditionalWriteAll(dict: dict<any>)
 enddef
 
 def RunTimerCb(tid: number)
-    var max_width = 30
+    var max_width = 20
     var popup_text: string
 
     for d in g:run_dict
-        if d.timer == tid
+        if has_key(d, "timer") && d.timer == tid
             if len(d.cmd) > max_width
-                popup_text = "Running " .. d.cmd[0 : max_width]
-                    .. "..."
+                popup_text = job_status(d.job) .. " "
                     .. (localtime() - d.started)
-                    .. "sec"
+                    .. "sec ("
+                    .. d.cmd[0 : max_width]
+                    .. "...)"
             else
-                popup_text = "Running " .. d.cmd
-                    .. " "
+                popup_text = job_status(d.job) .. " "
                     .. (localtime() - d.started)
-                    .. "sec"
+                    .. "sec ("
+                    .. d.cmd
+                    .. ")"
             endif
             popup_settext(d.winid, popup_text)
             break
@@ -133,11 +141,12 @@ def RunTimerCb(tid: number)
 enddef
 
 export def Run(dict: dict<any>): job
-    var job: job
+    var v_job: job
     var v_bufnr: number
     var v_winid: number
     var v_bufname: string
     var v_regexp: string
+    var save_winid = win_getid(winnr())
 
     var job_opts = {}
 
@@ -156,7 +165,7 @@ export def Run(dict: dict<any>): job
     if has_key(dict, "hidden") && (dict.hidden == true)
         job_opts.cwd = has_key(dict, "cwd") ? dict.cwd : getcwd()
         job_opts.err_cb = function("run#HiddenErrorCb")
-        job = job_start('cmd /C ' .. escape(dict.cmd, '\'), job_opts)
+        v_job = job_start('cmd /C ' .. escape(dict.cmd, '\'), job_opts)
     else
         if v_bufname == ""
             v_bufnr = bufadd(dict.cmd)
@@ -171,7 +180,7 @@ export def Run(dict: dict<any>): job
                 v_bufnr = bufadd(v_bufname)
                 setbufvar(v_bufnr, "&buftype", "nofile")
             endif
-            execute "buffer" v_bufnr
+
             nnoremap <buffer> <Esc> <Cmd>bw!<CR>
             appendbufline(v_bufnr, "$", "-----" .. strftime("%X") .. "------" .. dict.cmd .. "-----")
             normal G
@@ -184,30 +193,52 @@ export def Run(dict: dict<any>): job
         job_opts.out_io = "buffer"
         job_opts.close_cb = function("run#CloseCb")
 
-        job = job_start('cmd /C ' .. escape(dict.cmd, ''), job_opts)
-        var v_channel = split(string(job_getchannel(job)), " ")[1]
+        v_job = job_start('cmd /C ' .. escape(dict.cmd, ''), job_opts)
+        var v_channel = split(string(job_getchannel(v_job)), " ")[1]
         var popup_text: string
 
-        if len(dict.cmd) > 40
-            popup_text = dict.cmd[0 : 40] .. "..."
+
+        if !has_key(dict, "no_popup") || (dict.no_popup == false)
+            # split
+            # execute "buffer" v_bufnr
+            # wincmd J
+
+            if len(dict.cmd) > 40
+                popup_text = "Started (" .. dict.cmd[0 : 40] .. "...)"
+            else
+                popup_text = "Started (" .. dict.cmd .. ")"
+            endif
+            v_winid = popup_create(popup_text, g:Winopts())
+            execute "buffer" v_bufnr
+            add(g:run_dict, {
+                winid: v_winid,
+                timer: timer_start(1000, RunTimerCb, {repeat: -1}),
+                job: v_job,
+                channel: v_channel,
+                cmd: dict.cmd,
+                regexp: v_regexp,
+                bufname: v_bufname,
+                bufnr: v_bufnr,
+                started: localtime()
+            })
         else
-            popup_text = dict.cmd
+            add(g:run_dict, {
+                job: v_job,
+                channel: v_channel,
+                cmd: dict.cmd,
+                regexp: v_regexp,
+                bufname: v_bufname,
+                bufnr: v_bufnr,
+                started: localtime()
+            })
         endif
-        v_winid = popup_create("Started " .. popup_text, g:Winopts())
-
-        add(g:run_dict, {
-            channel: v_channel,
-            winid: v_winid,
-            cmd: dict.cmd,
-            regexp: v_regexp,
-            bufname: v_bufname,
-            bufnr: v_bufnr,
-            timer: timer_start(1000, RunTimerCb, {repeat: -1}),
-            started: localtime()
-        })
+
+
     endif
 
-    return job
+    win_gotoid(save_winid)
+
+    return v_job
 enddef
 
 augroup GroupRun

--- a/autoload/torchlight.vim
+++ b/autoload/torchlight.vim
@@ -13,6 +13,9 @@ export def TorchlightClearAll()
     endfor
 enddef
 
+# Clear properties on current line
+# This might work for you
+#       `autocmd TextChanged * torchlight.TorchlightChanged()`
 export def TorchlightChanged()
     prop_clear(line("."))
 enddef

--- a/plugin/hg.vim
+++ b/plugin/hg.vim
@@ -33,7 +33,9 @@ enddef
 
 command! -complete=custom,CompleteHg -nargs=+ Hg run.Run({cmd: 'hg <args>', name: "HG-OUTPUT"})
 
-nnoremap <Leader>v :<C-u>Hg<Space>
+nnoremap <Leader>vv :<C-u>Hg<Space>
+nnoremap <Leader>vs <Cmd>Hg status<CR>
+nnoremap <Leader>vl <Cmd>Hg sl<CR>
 
 # Uncomment when testing
 defcompile

--- a/plugin/ripgrep.vim
+++ b/plugin/ripgrep.vim
@@ -44,8 +44,8 @@ set grepprg=rg\ --vimgrep\ $*
 set grepformat=%f:%l:%c:%m
 
 command! -complete=file -nargs=* RgFiles run.Run({cmd: "rg --files" .. g:RgGlobSwitch() .. join(split(<q-args>, " "), g:RgGlobSwitch() ), name: "RG-OUTPUT"})
-command! -complete=file -nargs=* Rg      run.Run({cmd: 'rg --vimgrep ' .. ' <args> ' .. join(g:rg_paths, " "), regexp: &grepformat})
-command! -complete=file -nargs=* RgNoDir run.Run({cmd: 'rg --vimgrep ' .. ' <args> ', regexp: &grepformat})
+command! -complete=file -nargs=* Rg      run.Run({cmd: 'rg --vimgrep ' .. ' <args> ' .. join(g:rg_paths, " "), regexp: &grepformat, no_popup: true})
+command! -complete=file -nargs=* RgNoDir run.Run({cmd: 'rg --vimgrep ' .. ' <args> ', regexp: &grepformat, no_popup: true})
 
 nnoremap <Leader>F :RgFiles<C-r>=g:RgExcludes()<CR><C-r>=g:RgGlobSwitch()<CR> **<Left>
 nnoremap <Leader>R :Rg <C-r>=g:RgExcludes()<CR> <C-r>=RgIncludes(&ft)<CR> <C-r>=RgPattern()<CR>

--- a/plugin/torchlight.vim
+++ b/plugin/torchlight.vim
@@ -3,7 +3,7 @@ import autoload "torchlight.vim"
 
 augroup GroupTorchlight
     autocmd!
-    autocmd TextChanged * torchlight.TorchlightChanged()
+    # autocmd TextChanged * torchlight.TorchlightChanged()
     autocmd QuickFixCmdPre make torchlight.TorchlightClearAll()
     autocmd QuickFixCmdPost make torchlight.TorchlightUpdate()
 augroup END

--- a/templates/local_vimrc
+++ b/templates/local_vimrc
@@ -19,6 +19,10 @@ set tagcase=match
 compiler gcc
 set makeprg=make
 
-" Markdown, please
-autocmd BufRead *.txt setfiletype markdown
-
+augroup GroupLocal
+    au!
+    " Markdown, please
+    au BufRead *.txt setfiletype markdown
+    " Remember last state of work
+    autocmd VimLeave * mksession! .session
+augroup END

--- a/vimrc
+++ b/vimrc
@@ -139,8 +139,6 @@ inoremap <C-x><C-CR> <C-x><C-]>
 
 " Switching modes
 inoremap <k0> <Esc>
-imap <Char-252> <Esc>
-nmap <Char-252> :
 
 " Consistent cursor movement
 noremap! <A-Left> <Home>
@@ -205,10 +203,9 @@ iabbrev {} { }<Left><Left>
 
 " }}}
 
-
 let FilePath = { -> expand("%:h") == "" ? "" : expand("%:h") .. g:slash }
-cnoremap <expr> <A-.> (FilePath() == ".") ? "." : FilePath()
-cnoremap <expr> <A-,> $HOME .. g:slash .. 'vimfiles' .. g:slash
+cnoremap <expr> <C-r>. (FilePath() == ".") ? "." : FilePath()
+cnoremap <expr> <C-r>, $HOME .. g:slash .. 'vimfiles' .. g:slash
 cmap <C-BS> <C-w>
 cmap <C-Del> <C-Right><C-w>
 
@@ -268,7 +265,6 @@ nnoremap <Leader>e :edit <C-r>=(FilePath() == ".") ? "." : FilePath()<CR>
 nnoremap <Leader>f :find<Space>
 nnoremap <Leader>b :buffer<Space>
 nnoremap <Leader>d <cmd>bdelete<CR>
-nnoremap <Leader>. :tjump /
 
 " Leader-t space
 nnoremap <Leader>tt <Cmd>tab split<CR>