From bc548b2ef90a9a12871bba1b16e19a55b28cc48d Mon Sep 17 00:00:00 2001 From: ilex Date: Sun, 13 Aug 2017 11:56:41 +0300 Subject: [PATCH] Fix bug with ALEPrevious for blank lines. ALEPrevious (as well as ALEPreviousWrap) does not work if there is an error in empty line like 'W391: blank line at end of file' in python. --- autoload/ale/loclist_jumping.vim | 2 +- test/test_loclist_jumping.vader | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/autoload/ale/loclist_jumping.vim b/autoload/ale/loclist_jumping.vim index 8a6b0b2..07334b9 100644 --- a/autoload/ale/loclist_jumping.vim +++ b/autoload/ale/loclist_jumping.vim @@ -32,7 +32,7 @@ function! ale#loclist_jumping#FindNearest(direction, wrap) abort \ { \ 'bufnr': bufnr(''), \ 'lnum': l:item.lnum, - \ 'col': min([max([l:item.col, 1]), len(getline(l:item.lnum))]), + \ 'col': min([max([l:item.col, 1]), max([len(getline(l:item.lnum)), 1])]), \ }, \ l:search_item \) diff --git a/test/test_loclist_jumping.vader b/test/test_loclist_jumping.vader index 793190d..da16767 100644 --- a/test/test_loclist_jumping.vader +++ b/test/test_loclist_jumping.vader @@ -32,6 +32,7 @@ After: Given foobar (Some imaginary filetype): 12345678 12345678 + Execute(loclist jumping should jump correctly when not wrapping): AssertEqual [2, 1], TestJump('before', 0, [2, 2]) @@ -74,3 +75,12 @@ Execute(We shouldn't move when jumping to the first item where there are none): let g:ale_buffer_info[bufnr('%')].loclist = [] AssertEqual [1, 6], TestJump(0, 0, [1, 6]) + +Execute(We should be able to jump when the error line is blank): + call add(g:ale_buffer_info[bufnr('%')].loclist, {'bufnr': bufnr(''), 'lnum': 3, 'col': 1}) + + AssertEqual 0, len(getline(3)) + AssertEqual [2, 8], TestJump('before', 0, [3, 1]) + AssertEqual [2, 8], TestJump('before', 1, [3, 1]) + AssertEqual [3, 1], TestJump('after', 0, [3, 1]) + AssertEqual [1, 2], TestJump('after', 1, [3, 1])