diff --git a/autoload/ale.vim b/autoload/ale.vim index ee1a0d54..01e17b15 100644 --- a/autoload/ale.vim +++ b/autoload/ale.vim @@ -258,9 +258,9 @@ function! ale#GetLocItemMessage(item, format_string) abort " Replace special markers with certain information. " \=l:variable is used to avoid escaping issues. + let l:msg = substitute(l:msg, '\v\%([^\%]*)code([^\%]*)\%', l:code_repl, 'g') let l:msg = substitute(l:msg, '\V%severity%', '\=l:severity', 'g') let l:msg = substitute(l:msg, '\V%linter%', '\=l:linter_name', 'g') - let l:msg = substitute(l:msg, '\v\%([^\%]*)code([^\%]*)\%', l:code_repl, 'g') " Replace %s with the text. let l:msg = substitute(l:msg, '\V%s', '\=a:item.text', 'g') diff --git a/test/test_cursor_warnings.vader b/test/test_cursor_warnings.vader index 2a6156f0..6156fd65 100644 --- a/test/test_cursor_warnings.vader +++ b/test/test_cursor_warnings.vader @@ -75,6 +75,17 @@ Before: \ 'type': 'E', \ 'text': 'lowercase error', \ }, + \ { + \ 'lnum': 3, + \ 'col': 5, + \ 'bufnr': bufnr('%'), + \ 'vcol': 0, + \ 'linter_name': 'fakecodelinter', + \ 'nr': -1, + \ 'type': 'E', + \ 'code': 'E001', + \ 'text': 'This error does not exist', + \ }, \ ], \ }, \} @@ -237,6 +248,14 @@ Execute(The %code% and %ifcode% should be removed when there's no code): AssertEqual 'Some information', GetLastMessage() +Execute(The %code% should be formatted correctly when other variables contain 'code'): + let g:ale_echo_msg_format = '%s (%linter%% code%)' + + call cursor(3, 5) + call ale#cursor#EchoCursorWarning() + + AssertEqual 'This error does not exist (fakecodelinter E001)', GetLastMessage() + Execute(The buffer message format option should take precedence): let g:ale_echo_msg_format = '%(code) %%s' let b:ale_echo_msg_format = 'FOO %s'