Update generated neovim config
This commit is contained in:
@ -15,7 +15,7 @@ jobs:
|
||||
version: nightly
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v4
|
||||
- name: Set Git user for running Git commands in unit tests
|
||||
run: |
|
||||
git config --global user.email "users@noreply.github.com"
|
||||
@ -23,7 +23,7 @@ jobs:
|
||||
- name: Fetch Git history for unit tests
|
||||
run: git fetch --no-tags --prune --unshallow
|
||||
- name: Checkout themis.vim
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
repository: thinca/vim-themis
|
||||
path: vim-themis
|
||||
@ -37,17 +37,17 @@ jobs:
|
||||
THEMIS_VIM: ${{ steps.vim.outputs.executable }}
|
||||
THEMIS_PROFILE: profile.txt
|
||||
run: ./vim-themis/bin/themis ./test/all.vimspec
|
||||
- uses: actions/setup-python@v1
|
||||
- uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: '3'
|
||||
- name: Report coverage
|
||||
run: |
|
||||
# https://github.com/Vimjas/covimerage/issues/95
|
||||
pip install 'click<8.0.0'
|
||||
pip install covimerage
|
||||
covimerage write_coverage profile.txt
|
||||
coverage report
|
||||
coverage xml
|
||||
- name: Upload coverage to codecov
|
||||
uses: codecov/codecov-action@v1
|
||||
uses: codecov/codecov-action@v4
|
||||
with:
|
||||
token: ${{ secrets.CODECOV_TOKEN }}
|
||||
|
||||
@ -58,7 +58,7 @@ jobs:
|
||||
neovim: [true, false]
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v4
|
||||
- name: Set Git user for running Git commands in unit tests
|
||||
run: |
|
||||
git config --global user.email "users@noreply.github.com"
|
||||
@ -66,7 +66,7 @@ jobs:
|
||||
- name: Fetch Git history for unit tests
|
||||
run: git fetch --no-tags --prune --unshallow
|
||||
- name: Checkout themis.vim
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
repository: thinca/vim-themis
|
||||
path: vim-themis
|
||||
@ -84,7 +84,9 @@ jobs:
|
||||
name: Run vint
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/setup-python@v1
|
||||
- run: pip install vim-vint
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: '3'
|
||||
- run: pip install setuptools vim-vint
|
||||
- run: vint --warning --verbose --enable-neovim ./autoload ./plugin
|
||||
|
||||
@ -348,8 +348,8 @@ On Vim, please install [vim-healthcheck](https://github.com/rhysd/vim-healthchec
|
||||
Distributed under [the MIT License](LICENSE)
|
||||
|
||||
[repo]: https://github.com/rhysd/git-messenger.vim
|
||||
[ci-badge]: https://github.com/rhysd/git-messenger.vim/workflows/CI/badge.svg?branch=master&event=push
|
||||
[ci]: https://github.com/rhysd/git-messenger.vim/actions?query=workflow%3ACI+branch%3Amaster
|
||||
[ci-badge]: https://github.com/rhysd/git-messenger.vim/actions/workflows/ci.yml/badge.svg
|
||||
[ci]: https://github.com/rhysd/git-messenger.vim/actions/workflows/ci.yml
|
||||
[codecov]: https://codecov.io/gh/rhysd/git-messenger.vim
|
||||
[codecov-badge]: https://codecov.io/gh/rhysd/git-messenger.vim/branch/master/graph/badge.svg
|
||||
[doc]: ./doc/git-messenger.txt
|
||||
|
||||
@ -1,8 +1,34 @@
|
||||
if has('nvim')
|
||||
function! s:report_error(msg, ...) abort
|
||||
if a:0 ==# 0
|
||||
call v:lua.vim.health.error(a:msg)
|
||||
else
|
||||
call v:lua.vim.health.error(a:msg, a:1)
|
||||
endif
|
||||
endfunction
|
||||
function! s:report_warn(msg, note) abort
|
||||
call v:lua.vim.health.warn(a:msg, a:note)
|
||||
endfunction
|
||||
function! s:report_ok(msg) abort
|
||||
call v:lua.vim.health.ok(a:msg)
|
||||
endfunction
|
||||
else
|
||||
function! s:report_error(msg) abort
|
||||
call health#report_error(a:msg)
|
||||
endfunction
|
||||
function! s:report_warn(msg, note) abort
|
||||
call health#report_warn(a:msg, a:note)
|
||||
endfunction
|
||||
function! s:report_ok(msg) abort
|
||||
call health#report_ok(a:msg)
|
||||
endfunction
|
||||
endif
|
||||
|
||||
function! s:check_job() abort
|
||||
if !has('nvim') && !has('job')
|
||||
call health#report_error('Not supported since +job feature is not enabled')
|
||||
call s:report_error('Not supported since +job feature is not enabled')
|
||||
else
|
||||
call health#report_ok('+job is available to execute Git command')
|
||||
call s:report_ok('+job is available to execute Git command')
|
||||
endif
|
||||
endfunction
|
||||
|
||||
@ -12,7 +38,7 @@ function! s:check_floating_window() abort
|
||||
endif
|
||||
|
||||
if !exists('*nvim_win_set_config')
|
||||
call health#report_warn(
|
||||
call s:report_warn(
|
||||
\ 'Neovim 0.3.0 or earlier does not support floating window feature. Preview window is used instead',
|
||||
\ 'Please install Neovim 0.4.0 or later')
|
||||
return
|
||||
@ -29,7 +55,7 @@ function! s:check_floating_window() abort
|
||||
\ })
|
||||
noautocmd call nvim_win_close(win_id, v:true)
|
||||
catch /^Vim\%((\a\+)\)\=:E118/
|
||||
call health#report_error(
|
||||
call s:report_error(
|
||||
\ 'Your Neovim is too old',
|
||||
\ [
|
||||
\ 'Please update Neovim to 0.4.0 or later',
|
||||
@ -38,23 +64,23 @@ function! s:check_floating_window() abort
|
||||
return
|
||||
endtry
|
||||
|
||||
call health#report_ok('Floating window is available for popup window')
|
||||
call s:report_ok('Floating window is available for popup window')
|
||||
endfunction
|
||||
|
||||
function! s:check_git_binary() abort
|
||||
let cmd = get(g:, 'git_messenger_git_command', 'git')
|
||||
if !executable(cmd)
|
||||
call health#report_error('`' . cmd . '` command is not found. Please set proper command to g:git_messenger_git_command')
|
||||
call s:report_error('`' . cmd . '` command is not found. Please set proper command to g:git_messenger_git_command')
|
||||
return
|
||||
endif
|
||||
|
||||
let output = substitute(system(cmd . ' -C . --version'), '\r\=\n', '', 'g')
|
||||
if v:shell_error
|
||||
call health#report_error('Git command `' . cmd . '` is broken (v1.8.5 or later is required): ' . output)
|
||||
call s:report_error('Git command `' . cmd . '` is broken (v1.8.5 or later is required): ' . output)
|
||||
return
|
||||
endif
|
||||
|
||||
call health#report_ok('Git command `' . cmd . '` is available: ' . output)
|
||||
call s:report_ok('Git command `' . cmd . '` is available: ' . output)
|
||||
endfunction
|
||||
|
||||
function! s:check_vim_version() abort
|
||||
@ -63,13 +89,13 @@ function! s:check_vim_version() abort
|
||||
endif
|
||||
|
||||
if v:version < 800
|
||||
call health#report_error(
|
||||
call s:report_error(
|
||||
\ 'Your Vim version is too old: ' . v:version,
|
||||
\ 'Please install Vim 8.0 or later')
|
||||
return
|
||||
endif
|
||||
|
||||
call health#report_ok('Vim version is fine: ' . v:version)
|
||||
call s:report_error('Vim version is fine: ' . v:version)
|
||||
endfunction
|
||||
|
||||
function! health#gitmessenger#check() abort
|
||||
|
||||
Reference in New Issue
Block a user