Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tests/vim/vimrc: move loading plugin to the end #2468

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

tests/vim/vimrc: move loading plugin to the end #2468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9f0bfa
tests/vim/vimrc: move loading plugin to the end
blueyed Feb 8, 2020
1b8cf9a
fix/harden tests/isolated/signs.vader
blueyed Feb 8, 2020
d21499b
fix tests/isolated/sign-highlights.vader for neovim-v0.1.7
blueyed Feb 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions tests/isolated/sign-highlights.vader
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Include: ../include/setup.vader

Execute (neomake#signs#DefineHighlights: SignColumn bg=NONE):
" Explicitly trigger ColorScheme, for neovim-v0.1.7 at least (but not later).
doautocmd ColorScheme
hi clear Error
hi clear Normal
hi clear LineNr
Expand Down
3 changes: 3 additions & 0 deletions tests/isolated/signs.vader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ Include: ../include/setup.vader

Execute (Signs are not wiped when buffer gets wiped with removed augroup):
new
Assert !exists('#neomake_signs')
doautocmd ColorScheme
au! neomake_signs
let buf = bufnr('%')
call neomake#signs#PlaceSigns(bufnr('%'),
Expand All @@ -11,6 +13,7 @@ Execute (Signs are not wiped when buffer gets wiped with removed augroup):

AssertEqual neomake#signs#by_lnum(buf), {}
call neomake#signs#ResetFile(buf)
AssertNeomakeMessage 'Placing sign: sign place 5000 line=1 name=neomake_file_err buffer='.buf.'.'
AssertNeomakeMessage 'Skipped cleaning of old signs in non-existing buffer '.buf.': {5000: neomake_file_err}.', 3

" Restore if not profiling.
Expand Down
10 changes: 5 additions & 5 deletions tests/vim/vimrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,6 @@ function! s:load_plugin_on_demand(name) abort
endfunction
command! -nargs=1 NeomakeTestsLoadPlugin call s:load_plugin_on_demand(<args>)

let s:plugin_dir = expand('<sfile>:p:h:h:h')
let &runtimepath .= ','.s:plugin_dir

exe 'source' join([s:plugin_dir, 'plugin', 'neomake.vim'], s:slash)

filetype plugin indent on

augroup ssshhhhhh
Expand Down Expand Up @@ -105,3 +100,8 @@ endif

" Avoid system call and warning.
let g:neomake_clippy_rustup_has_nightly = 0

" Load the plugin.
let s:plugin_dir = expand('<sfile>:p:h:h:h')
let &runtimepath .= ','.s:plugin_dir
exe 'source' join([s:plugin_dir, 'plugin', 'neomake.vim'], s:slash)