Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Bartek thindil Jasicki
2019-11-07 22:07:26 +01:00
9 changed files with 72 additions and 13 deletions

View File

@@ -9,18 +9,14 @@ Before:
Save b:ale_c_build_dir_names
Save b:ale_c_parse_compile_commands
let b:command_tail = ' -x c'
After:
unlet! b:command_tail
call ale#assert#TearDownLinterTest()
Execute(The language string should be correct):
AssertLSPLanguage 'c'
Execute(The default executable should be correct):
AssertLinter 'clangd', ale#Escape('clangd') . b:command_tail
AssertLinter 'clangd', ale#Escape('clangd')
Execute(The project root should be detected correctly):
call ale#test#SetFilename(tempname() . '/dummy.c')
@@ -34,12 +30,12 @@ Execute(The project root should be detected correctly):
Execute(The executable should be configurable):
let g:ale_c_clangd_executable = 'foobar'
AssertLinter 'foobar', ale#Escape('foobar') . b:command_tail
AssertLinter 'foobar', ale#Escape('foobar')
Execute(The options should be configurable):
let b:ale_c_clangd_options = '-compile-commands-dir=foo'
AssertLinter 'clangd', ale#Escape('clangd') . b:command_tail . ' ' . b:ale_c_clangd_options
AssertLinter 'clangd', ale#Escape('clangd') . ' ' . b:ale_c_clangd_options
Execute(The compile command database should be detected correctly):
call ale#test#SetFilename('clangd_paths/with_build_dir/dummy_src/dummy.c')
@@ -49,7 +45,7 @@ Execute(The compile command database should be detected correctly):
let b:ale_c_build_dir_names = ['unusual_build_dir_name']
let b:ale_c_parse_compile_commands = 1
AssertLinter 'clangd', ale#Escape('clangd') . b:command_tail
AssertLinter 'clangd', ale#Escape('clangd')
\ . ' -compile-commands-dir='
\ . ale#Escape(ale#path#Simplify(g:dir . '/clangd_paths/with_build_dir/unusual_build_dir_name'))