1
0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-01-23 11:30:06 +08:00

Compare commits

...

4 Commits

Author SHA1 Message Date
Eric Wong
eacd71c784 feat(git): lua complete for git-fetch 2024-12-17 19:13:47 +08:00
Eric Wong
7959583115 docs(website): remove r/SpaceVim 2024-12-17 18:14:37 +08:00
Eric Wong
bde1252f93 feat(git): lua completion for sub command 2024-12-17 17:50:28 +08:00
Eric Wong
3ffa25addc feat(git): implement lua complete for git-tag 2024-12-17 17:30:08 +08:00
16 changed files with 339 additions and 230 deletions

View File

@ -6,8 +6,6 @@
[![twitter](https://img.spacevim.org/twitter.svg)](https://twitter.com/SpaceVim)
[![GPLv3 License](https://img.spacevim.org/license-GPLv3-blue.svg)](development/#license)
[![reddit](https://img.spacevim.org/reddit.svg)](https://www.reddit.com/r/SpaceVim/)
[![matrix](https://img.spacevim.org/spacevim-matrix.svg)](https://app.element.io/#/room/#spacevim:matrix.org)
![work-flow](https://img.spacevim.org/workflow.png)

View File

@ -2872,10 +2872,6 @@ endfunction
" send email to spacevim@googlegroups.com
"
" To subscribe the maillist, send anything tospacevim+subscribe@googlegroups.com
"
" @subsection Forum
"
" - Reddit: https://www.reddit.com/r/SpaceVim/
""
" @section Roadmap, roadmap

View File

@ -1,47 +1,71 @@
let s:JOB = SpaceVim#api#import('job')
"=============================================================================
" fetch.vim --- Git fetch command
" Copyright 2021 Eric Wong
" Author: Eric Wong < wsdjeg@outlook.com >
" URL: https://spacevim.org
" License: GPLv3
"=============================================================================
function! git#fetch#run(args)
if has('nvim-0.9.0')
function! git#fetch#complete(ArgLead, CmdLine, CursorPos) abort
return luaeval('require("git.command.fetch").complete(vim.api.nvim_eval("a:ArgLead"), vim.api.nvim_eval("a:CmdLine"), vim.api.nvim_eval("a:CursorPos"))')
endfunction
else
""
" @section git-fetch, fetch
" @parentsection commands
" This commands is to fetch remote repo.
" >
" :Git fetch --all
" <
let s:JOB = SpaceVim#api#import('job')
function! git#fetch#run(args)
let cmd = ['git', 'fetch'] + a:args
call git#logger#debug('git-fetch cmd:' . string(cmd))
call s:JOB.start(cmd,
\ {
\ 'on_exit' : function('s:on_exit'),
\ }
\ )
\ {
\ 'on_exit' : function('s:on_exit'),
\ }
\ )
endfunction
endfunction
function! s:on_exit(id, data, event) abort
function! s:on_exit(id, data, event) abort
call git#logger#debug('git-fetch exit data:' . string(a:data))
if a:data ==# 0
echo 'fetch done!'
echo 'fetch done!'
else
echo 'fetch failed!'
echo 'fetch failed!'
endif
endfunction
endfunction
function! git#fetch#complete(ArgLead, CmdLine, CursorPos)
function! git#fetch#complete(ArgLead, CmdLine, CursorPos)
if a:ArgLead =~# '^-'
return s:options()
return s:options()
endif
let str = a:CmdLine[:a:CursorPos-1]
if str =~# '^Git\s\+fetch\s\+[^ ]*$'
return join(s:remotes(), "\n")
return join(s:remotes(), "\n")
else
return ''
return ''
endif
endfunction
endfunction
function! s:remotes() abort
function! s:remotes() abort
return map(systemlist('git remote'), 'trim(v:val)')
endfunction
endfunction
function! s:options() abort
function! s:options() abort
return join([
\ '--all',
\ '--multiple',
\ ], "\n")
endfunction
\ '--all',
\ '--multiple',
\ ], "\n")
endfunction
endif

View File

@ -1,37 +1,50 @@
let s:JOB = SpaceVim#api#import('job')
"=============================================================================
" reset.vim --- git reset command
" Copyright (c) 2016-2019 Wang Shidong & Contributors
" Author: Wang Shidong < wsdjeg@outlook.com >
" URL: https://spacevim.org
" License: GPLv3
"=============================================================================
if has('nvim-0.9.0')
function! git#reset#complete(ArgLead, CmdLine, CursorPos) abort
return luaeval('require("git.command.reset").complete(vim.api.nvim_eval("a:ArgLead"), vim.api.nvim_eval("a:CmdLine"), vim.api.nvim_eval("a:CursorPos"))')
endfunction
else
let s:JOB = SpaceVim#api#import('job')
function! git#reset#run(args)
function! git#reset#run(args)
if len(a:args) == 1 && a:args[0] ==# '%'
let cmd = ['git', 'reset', 'HEAD', expand('%')]
let cmd = ['git', 'reset', 'HEAD', expand('%')]
else
let cmd = ['git', 'reset'] + a:args
let cmd = ['git', 'reset'] + a:args
endif
call git#logger#debug('git-reset cmd:' . string(cmd))
call s:JOB.start(cmd,
\ {
\ 'on_exit' : function('s:on_exit'),
\ }
\ )
\ {
\ 'on_exit' : function('s:on_exit'),
\ }
\ )
endfunction
endfunction
function! s:on_exit(id, data, event) abort
function! s:on_exit(id, data, event) abort
call git#logger#debug('git-reset exit data:' . string(a:data))
if a:data ==# 0
if exists(':GitGutter')
GitGutter
endif
echo 'done!'
if exists(':GitGutter')
GitGutter
endif
echo 'done!'
else
echo 'failed!'
echo 'failed!'
endif
endfunction
endfunction
function! git#reset#complete(ArgLead, CmdLine, CursorPos)
function! git#reset#complete(ArgLead, CmdLine, CursorPos)
return "%\n" . join(getcompletion(a:ArgLead, 'file'), "\n")
endfunction
endfunction
endif

View File

@ -7,38 +7,44 @@
" :Git rm %
" <
let s:JOB = SpaceVim#api#import('job')
if has('nvim-0.9.0')
function! git#rm#complete(ArgLead, CmdLine, CursorPos) abort
return luaeval('require("git.command.rm").complete(vim.api.nvim_eval("a:ArgLead"), vim.api.nvim_eval("a:CmdLine"), vim.api.nvim_eval("a:CursorPos"))')
endfunction
else
let s:JOB = SpaceVim#api#import('job')
function! git#rm#run(files) abort
function! git#rm#run(files) abort
if len(a:files) == 1 && a:files[0] ==# '%'
let cmd = ['git', 'rm', expand('%')]
let cmd = ['git', 'rm', expand('%')]
else
let cmd = ['git', 'rm'] + a:files
let cmd = ['git', 'rm'] + a:files
endif
call git#logger#debug('git-rm cmd:' . string(cmd))
call s:JOB.start(cmd,
\ {
\ 'on_exit' : function('s:on_exit'),
\ }
\ )
\ {
\ 'on_exit' : function('s:on_exit'),
\ }
\ )
endfunction
endfunction
function! s:on_exit(id, data, event) abort
function! s:on_exit(id, data, event) abort
call git#logger#debug('git-rm exit data:' . string(a:data))
if a:data ==# 0
if exists(':GitGutter')
GitGutter
endif
echo 'done!'
if exists(':GitGutter')
GitGutter
endif
echo 'done!'
else
echo 'failed!'
echo 'failed!'
endif
endfunction
endfunction
function! git#rm#complete(ArgLead, CmdLine, CursorPos) abort
function! git#rm#complete(ArgLead, CmdLine, CursorPos) abort
return "%\n" . join(getcompletion(a:ArgLead, 'file'), "\n")
endfunction
endfunction
endif

View File

@ -6,104 +6,109 @@
" :Git stash list
" <
let s:JOB = SpaceVim#api#import('job')
let s:NOTI = SpaceVim#api#import('notify')
let s:BUFFER = SpaceVim#api#import('vim#buffer')
if has('nvim-0.9.0')
function! git#stash#complete(ArgLead, CmdLine, CursorPos) abort
return luaeval('require("git.command.stash").complete(vim.api.nvim_eval("a:ArgLead"), vim.api.nvim_eval("a:CmdLine"), vim.api.nvim_eval("a:CursorPos"))')
endfunction
else
let s:JOB = SpaceVim#api#import('job')
let s:NOTI = SpaceVim#api#import('notify')
let s:BUFFER = SpaceVim#api#import('vim#buffer')
let s:stash_show_bufnr = -1
" @todo rewrite Git stash in lua
function! git#stash#run(args) abort
let s:stash_show_bufnr = -1
" @todo rewrite Git stash in lua
function! git#stash#run(args) abort
let cmd = ['git', 'stash'] + a:args
let subcmd = get(a:args, 0, '')
if !empty(subcmd) && index(['drop', 'show'], subcmd) > -1
let subcmd = subcmd . '_'
let subcmd = subcmd . '_'
else
let subcmd = ''
let subcmd = ''
endif
call git#logger#debug('git-stash cmd:' . string(cmd))
let s:lines = []
call s:JOB.start(cmd,
\ {
\ 'on_stderr' : function('s:on_' . subcmd . 'stderr'),
\ 'on_stdout' : function('s:on_' . subcmd . 'stdout'),
\ 'on_exit' : function('s:on_' . subcmd . 'exit'),
\ }
\ )
endfunction
\ {
\ 'on_stderr' : function('s:on_' . subcmd . 'stderr'),
\ 'on_stdout' : function('s:on_' . subcmd . 'stdout'),
\ 'on_exit' : function('s:on_' . subcmd . 'exit'),
\ }
\ )
endfunction
function! s:on_stdout(id, data, event) abort
function! s:on_stdout(id, data, event) abort
for line in filter(a:data, '!empty(v:val)')
call git#logger#debug('git-stash stdout:' . line)
call s:NOTI.notify(line, 'Normal')
call git#logger#debug('git-stash stdout:' . line)
call s:NOTI.notify(line, 'Normal')
endfor
endfunction
endfunction
function! s:on_stderr(id, data, event) abort
function! s:on_stderr(id, data, event) abort
for data in a:data
call git#logger#debug('git-stash stderr:' . data)
call git#logger#debug('git-stash stderr:' . data)
endfor
endfunction
endfunction
function! s:on_exit(id, data, event) abort
function! s:on_exit(id, data, event) abort
call git#logger#debug('git-stash exit data:' . string(a:data))
if a:data ==# 0
" echo 'done!'
" echo 'done!'
else
" echo 'failed!'
" echo 'failed!'
endif
endfunction
endfunction
function! s:on_drop_stdout(id, data, event) abort
function! s:on_drop_stdout(id, data, event) abort
for line in filter(a:data, '!empty(v:val)')
call git#logger#debug('git-stash stdout:' . line)
call s:NOTI.notify(line, 'Normal')
call git#logger#debug('git-stash stdout:' . line)
call s:NOTI.notify(line, 'Normal')
endfor
endfunction
endfunction
function! s:on_drop_stderr(id, data, event) abort
function! s:on_drop_stderr(id, data, event) abort
for line in filter(a:data, '!empty(v:val)')
call git#logger#debug('git-stash stdout:' . line)
call s:NOTI.notify(line, 'WarningMsg')
call git#logger#debug('git-stash stdout:' . line)
call s:NOTI.notify(line, 'WarningMsg')
endfor
endfunction
endfunction
function! s:on_drop_exit(id, data, event) abort
function! s:on_drop_exit(id, data, event) abort
call git#logger#debug('git-stash exit data:' . string(a:data))
if a:data ==# 0
" echo 'done!'
" echo 'done!'
else
" echo 'failed!'
" echo 'failed!'
endif
endfunction
endfunction
function! s:on_show_stdout(id, data, event) abort
function! s:on_show_stdout(id, data, event) abort
for data in a:data
call git#logger#debug('git-stash stdout:' . data)
call git#logger#debug('git-stash stdout:' . data)
endfor
let s:lines += a:data
endfunction
endfunction
function! s:on_show_stderr(id, data, event) abort
function! s:on_show_stderr(id, data, event) abort
for line in filter(a:data, '!empty(v:val)')
call git#logger#debug('git-stash stdout:' . line)
call s:NOTI.notify(line, 'WarningMsg')
call git#logger#debug('git-stash stdout:' . line)
call s:NOTI.notify(line, 'WarningMsg')
endfor
endfunction
endfunction
function! s:on_show_exit(id, data, event) abort
function! s:on_show_exit(id, data, event) abort
call git#logger#debug('git-stash exit data:' . string(a:data))
if a:data ==# 0
if !bufexists(s:stash_show_bufnr)
let s:stash_show_bufnr = s:openStashShowBuffer()
endif
call s:BUFFER.buf_set_lines(s:stash_show_bufnr, 0 , -1, 0, s:lines)
if !bufexists(s:stash_show_bufnr)
let s:stash_show_bufnr = s:openStashShowBuffer()
endif
call s:BUFFER.buf_set_lines(s:stash_show_bufnr, 0 , -1, 0, s:lines)
endif
endfunction
endfunction
function! s:openStashShowBuffer() abort
function! s:openStashShowBuffer() abort
edit git://blame
normal! "_dd
setl nobuflisted
@ -114,30 +119,31 @@ function! s:openStashShowBuffer() abort
setl syntax=diff
nnoremap <buffer><silent> q :bd!<CR>
return bufnr('%')
endfunction
endfunction
function! s:sub_commands() abort
function! s:sub_commands() abort
return join([
\ 'list',
\ 'show',
\ 'drop',
\ 'pop', 'apply',
\ 'branch',
\ 'clear',
\ 'save',
\ 'push',
\ ],
\ "\n")
endfunction
\ 'list',
\ 'show',
\ 'drop',
\ 'pop', 'apply',
\ 'branch',
\ 'clear',
\ 'save',
\ 'push',
\ ],
\ "\n")
endfunction
function! git#stash#complete(ArgLead, CmdLine, CursorPos) abort
function! git#stash#complete(ArgLead, CmdLine, CursorPos) abort
let str = a:CmdLine[:a:CursorPos-1]
if str =~# '^Git\s\+stash\s\+[a-z]\=$'
return s:sub_commands()
return s:sub_commands()
else
return ''
return ''
endif
endfunction
endfunction
endif

View File

@ -6,88 +6,94 @@
" :Git tag --list
" <
let s:JOB = SpaceVim#api#import('job')
let s:NT = SpaceVim#api#import('notify')
let s:jobid = -1
let s:stderr_data = []
function! git#tag#run(argvs) abort
if s:jobid != -1
call s:NT.notify('previous tag command is not finished')
return
endif
let s:NT.notify_max_width = float2nr(&columns * 0.3)
if has('nvim-0.9.0')
function! git#tag#complete(ArgLead, CmdLine, CursorPos) abort
return luaeval('require("git.command.tag").complete(vim.api.nvim_eval("a:ArgLead"), vim.api.nvim_eval("a:CmdLine"), vim.api.nvim_eval("a:CursorPos"))')
endfunction
else
let s:JOB = SpaceVim#api#import('job')
let s:NT = SpaceVim#api#import('notify')
let s:jobid = -1
let s:stderr_data = []
let cmd = ['git', 'tag'] + a:argvs
call git#logger#debug('git-tag cmd:' . string(cmd))
let s:jobid = s:JOB.start(cmd,
\ {
\ 'on_stdout' : function('s:on_stdout'),
\ 'on_stderr' : function('s:on_stderr'),
\ 'on_exit' : function('s:on_exit'),
\ }
\ )
function! git#tag#run(argvs) abort
if s:jobid == -1
call s:NT.notify('`git` is not executable', 'WarningMsg')
endif
if s:jobid != -1
call s:NT.notify('previous tag command is not finished')
return
endif
endfunction
let s:NT.notify_max_width = float2nr(&columns * 0.3)
function! s:on_stdout(id, data, event) abort
if a:id != s:jobid
return
endif
for line in a:data
call s:NT.notify(line)
endfor
endfunction
let s:stderr_data = []
function! s:on_stderr(id, data, event) abort
if a:id != s:jobid
return
endif
for line in a:data
call add(s:stderr_data, line)
endfor
endfunction
let cmd = ['git', 'tag'] + a:argvs
call git#logger#debug('git-tag cmd:' . string(cmd))
let s:jobid = s:JOB.start(cmd,
\ {
\ 'on_stdout' : function('s:on_stdout'),
\ 'on_stderr' : function('s:on_stderr'),
\ 'on_exit' : function('s:on_exit'),
\ }
\ )
function! s:on_exit(id, data, event) abort
call git#logger#debug('git-tag exit data:' . string(a:data))
if a:id != s:jobid
return
endif
if a:data ==# 0
for line in s:stderr_data
if s:jobid == -1
call s:NT.notify('`git` is not executable', 'WarningMsg')
endif
endfunction
function! s:on_stdout(id, data, event) abort
if a:id != s:jobid
return
endif
for line in a:data
call s:NT.notify(line)
endfor
else
for line in s:stderr_data
call s:NT.notify(line, 'WarningMsg')
endfunction
function! s:on_stderr(id, data, event) abort
if a:id != s:jobid
return
endif
for line in a:data
call add(s:stderr_data, line)
endfor
endif
let s:jobid = -1
endfunction
endfunction
function! s:options() abort
return [
\ '--list',
\ ]
endfunction
function! s:on_exit(id, data, event) abort
call git#logger#debug('git-tag exit data:' . string(a:data))
if a:id != s:jobid
return
endif
if a:data ==# 0
for line in s:stderr_data
call s:NT.notify(line)
endfor
else
for line in s:stderr_data
call s:NT.notify(line, 'WarningMsg')
endfor
endif
let s:jobid = -1
endfunction
function! git#tag#complete(ArgLead, CmdLine, CursorPos) abort
let str = a:CmdLine[:a:CursorPos-1]
if str =~# '^Git\s\+tag\s\+-$'
return join(s:options(), "\n")
elseif str =~# '^Git\s\+tag\s\+[^ ]*$'
return join(s:options(), "\n")
else
return ''
endif
function! s:options() abort
return [
\ '--list',
\ ]
endfunction
endfunction
function! git#tag#complete(ArgLead, CmdLine, CursorPos) abort
let str = a:CmdLine[:a:CursorPos-1]
if str =~# '^Git\s\+tag\s\+-$'
return join(s:options(), "\n")
elseif str =~# '^Git\s\+tag\s\+[^ ]*$'
return join(s:options(), "\n")
else
return ''
endif
endfunction
endif

View File

@ -10,11 +10,12 @@ CONTENTS *git-contents*
3. git-checkout............................................ |git-checkout|
4. git-cherry-pick...................................... |git-cherry-pick|
5. git-clean.................................................. |git-clean|
6. git-mv........................................................ |git-mv|
7. git-reflog................................................ |git-reflog|
8. git-rm........................................................ |git-rm|
9. git-stash.................................................. |git-stash|
10. git-tag..................................................... |git-tag|
6. git-fetch.................................................. |git-fetch|
7. git-mv........................................................ |git-mv|
8. git-reflog................................................ |git-reflog|
9. git-rm........................................................ |git-rm|
10. git-stash................................................. |git-stash|
11. git-tag..................................................... |git-tag|
3. Functions.................................................. |git-functions|
==============================================================================
@ -70,6 +71,14 @@ This commands is to run `git clean`.
:Git clean -f
<
==============================================================================
GIT-FETCH *git-fetch*
This commands is to fetch remote repo.
>
:Git fetch --all
<
==============================================================================
GIT-MV *git-mv*

View File

@ -1,12 +1,12 @@
--=============================================================================
-- fetch.lua --- :Git fetch
-- Copyright (c) 2016-2022 Wang Shidong & Contributors
-- Author: Wang Shidong < wsdjeg@outlook.com >
-- fetch.lua --- Git fetch
-- Copyright 2023 Eric Wong
-- Author: Eric Wong < wsdjeg@outlook.com >
-- URL: https://spacevim.org
-- License: GPLv3
--=============================================================================
local m = {}
local M = {}
local job = require('spacevim.api.job')
local nt = require('spacevim.api.notify')
@ -28,7 +28,7 @@ local function on_std(id, data)
end
end
function m.run(argv)
function M.run(argv)
local cmd = { 'git', 'fetch' }
for _, v in ipairs(argv) do
table.insert(cmd, v)
@ -38,8 +38,27 @@ function m.run(argv)
job.start(cmd, {
on_exit = on_exit,
on_stdout = on_std,
on_stderr = on_std
on_stderr = on_std,
})
end
return m
local function get_remotes()
return vim.tbl_map(function(t)
return vim.fn.trim(t)
end, vim.fn.systemlist('git remote'))
end
function M.complete(ArgLead, CmdLine, CursorPos)
if vim.startswith(ArgLead, '-') then
return table.concat({ '--all', '--multiple' }, '\n')
end
local str = string.sub(CmdLine, 1, CursorPos)
if vim.regex([[^Git\s\+fetch\s\+[^ ]*$]]):match_str(str) then
return table.concat(get_remotes(), '\n')
else
return ''
end
end
return M

View File

@ -5,7 +5,7 @@
-- URL: https://spacevim.org
-- License: GPLv3
--=============================================================================
local m = {}
local M = {}
local job = require('spacevim.api.job')
local nt = require('spacevim.api.notify')
@ -23,7 +23,7 @@ local function on_exit(id, code, single)
end
end
function m.run(argv)
function M.run(argv)
local cmd = { 'git', 'reset' }
if #argv == 1 and argv[1] == '%' then
cmd = { 'git', 'reset', 'HEAD', vim.fn.expand('%') }
@ -38,4 +38,9 @@ function m.run(argv)
})
end
return m
function M.complete(ArgLead, CmdLine, CursorPos)
local rst = vim.fn.getcompletion(ArgLead, 'file')
return table.concat(rst, '\n')
end
return M

View File

@ -47,4 +47,9 @@ function m.run(argv)
})
end
function M.complete(ArgLead, CmdLine, CursorPos)
local rst = vim.fn.getcompletion(ArgLead, 'file')
return table.concat(rst, '\n')
end
return m

View File

@ -97,4 +97,27 @@ function M.run(argv)
end
end
local function sub_commands()
return {
'list',
'show',
'drop',
'pop',
'apply',
'branch',
'clear',
'save',
'push',
}
end
function M.complete(ArgLead, CmdLine, CursorPos)
local str = string.sub(CmdLine, 1, CursorPos)
if vim.regex([[^Git\s\+stash\s\+[a-z]\+$]]):match_str(str) then
return table.concat(sub_commands(), '\n')
else
return ''
end
end
return M

View File

@ -72,7 +72,14 @@ function M.run(argv)
end
end
function M.complete(ArgLead, CmdLine, CursorPos) end
function M.complete(ArgLead, CmdLine, CursorPos)
local str = string.sub(CmdLine, 1, CursorPos)
if vim.regex([[^Git\s\+tag\s\+-\+$]]):match_str(str) then
return table.concat({'--list'}, '\n')
else
return ''
end
end
return M

View File

@ -8465,10 +8465,6 @@ send email to spacevim@googlegroups.com
To subscribe the maillist, send anything
tospacevim+subscribe@googlegroups.com
FORUM
Reddit: https://www.reddit.com/r/SpaceVim/
==============================================================================
FAQ *SpaceVim-faq*

View File

@ -6,8 +6,6 @@ lang: zh
[![twitter](https://img.spacevim.org/twitter.svg)](https://twitter.com/SpaceVim)
[![GPLv3 License](https://img.spacevim.org/license-GPLv3-blue.svg)](development/#证书)
[![reddit](https://img.spacevim.org/reddit.svg)](https://www.reddit.com/r/SpaceVim/)
-[![matrix](https://img.spacevim.org/spacevim-cn-matrix.svg)](https://app.element.io/#/room/#spacevim-cn:matrix.org)
![work-flow](https://img.spacevim.org/workflow.png)

View File

@ -5,8 +5,6 @@ description: "SpaceVim is a modular Vim/Neovim configuration that seeks to provi
[![twitter](https://img.spacevim.org/twitter.svg)](https://twitter.com/SpaceVim)
[![GPLv3 License](https://img.spacevim.org/license-GPLv3-blue.svg)](development/#license)
[![reddit](https://img.spacevim.org/reddit.svg)](https://www.reddit.com/r/SpaceVim/)
[![matrix](https://img.spacevim.org/spacevim-matrix.svg)](https://app.element.io/#/room/#spacevim:matrix.org)
![work-flow](https://img.spacevim.org/workflow.png)