From aef11cc0d2bca89e98aacee0c42ac9b551deea02 Mon Sep 17 00:00:00 2001 From: David Hotham Date: Mon, 27 Aug 2018 13:52:49 +0100 Subject: [PATCH] Fix out-by-one error in column on goto-definition Fixes #1860 --- autoload/ale/definition.vim | 2 +- test/test_go_to_definition.vader | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/autoload/ale/definition.vim b/autoload/ale/definition.vim index 18bec988..18cda940 100644 --- a/autoload/ale/definition.vim +++ b/autoload/ale/definition.vim @@ -49,7 +49,7 @@ function! ale#definition#HandleLSPResponse(conn_id, response) abort for l:item in l:result let l:filename = ale#path#FromURI(l:item.uri) let l:line = l:item.range.start.line + 1 - let l:column = l:item.range.start.character + let l:column = l:item.range.start.character + 1 call ale#util#Open(l:filename, l:line, l:column, l:options) break diff --git a/test/test_go_to_definition.vader b/test/test_go_to_definition.vader index 53f566e9..b7d1f42c 100644 --- a/test/test_go_to_definition.vader +++ b/test/test_go_to_definition.vader @@ -209,7 +209,7 @@ Execute(Other files should be jumped to for LSP definition responses): \ 'edit +3 ' . fnameescape(ale#path#Simplify(g:dir . '/completion_dummy_file')), \ ], \ g:expr_list - AssertEqual [3, 7], getpos('.')[1:2] + AssertEqual [3, 8], getpos('.')[1:2] AssertEqual {}, ale#definition#GetMap() Execute(Locations inside the same file should be jumped to without using :edit): @@ -231,7 +231,7 @@ Execute(Locations inside the same file should be jumped to without using :edit): \ [ \ ], \ g:expr_list - AssertEqual [3, 7], getpos('.')[1:2] + AssertEqual [3, 8], getpos('.')[1:2] AssertEqual {}, ale#definition#GetMap() Execute(Other files should be jumped to in tabs for LSP definition responses): @@ -254,7 +254,7 @@ Execute(Other files should be jumped to in tabs for LSP definition responses): \ 'tabedit +3 ' . fnameescape(ale#path#Simplify(g:dir . '/completion_dummy_file')), \ ], \ g:expr_list - AssertEqual [3, 7], getpos('.')[1:2] + AssertEqual [3, 8], getpos('.')[1:2] AssertEqual {}, ale#definition#GetMap() Execute(Definition responses with lists should be handled): @@ -285,7 +285,7 @@ Execute(Definition responses with lists should be handled): \ 'edit +3 ' . fnameescape(ale#path#Simplify(g:dir . '/completion_dummy_file')), \ ], \ g:expr_list - AssertEqual [3, 7], getpos('.')[1:2] + AssertEqual [3, 8], getpos('.')[1:2] AssertEqual {}, ale#definition#GetMap() Execute(Definition responses with null response should be handled):