marc/ale
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1793 from kodemeister/cquery

Browse source 
Use .cquery file to detect the project root
This commit is contained in:
w0rp 2018-08-10 18:23:55 +01:00 committed by GitHub
commit a56e801567
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 56 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ale_linters/c/cquery.vim
View file

@ -6,6 +6,11 @@ call ale#Set('c_cquery_cache_directory', expand('~/.cache/cquery'))
function! ale_linters#c#cquery#GetProjectRoot(buffer) abort function! ale_linters#c#cquery#GetProjectRoot(buffer) abort
let l:project_root = ale#path#FindNearestFile(a:buffer, 'compile_commands.json') let l:project_root = ale#path#FindNearestFile(a:buffer, 'compile_commands.json')
if empty(l:project_root)
let l:project_root = ale#path#FindNearestFile(a:buffer, '.cquery')
endif
return !empty(l:project_root) ? fnamemodify(l:project_root, ':h') : '' return !empty(l:project_root) ? fnamemodify(l:project_root, ':h') : ''
endfunction endfunction

4
ale_linters/cpp/cquery.vim
View file

@ -7,6 +7,10 @@ call ale#Set('cpp_cquery_cache_directory', expand('~/.cache/cquery'))
function! ale_linters#cpp#cquery#GetProjectRoot(buffer) abort function! ale_linters#cpp#cquery#GetProjectRoot(buffer) abort
let l:project_root = ale#path#FindNearestFile(a:buffer, 'compile_commands.json') let l:project_root = ale#path#FindNearestFile(a:buffer, 'compile_commands.json')
if empty(l:project_root)
let l:project_root = ale#path#FindNearestFile(a:buffer, '.cquery')
endif
return !empty(l:project_root) ? fnamemodify(l:project_root, ':h') : '' return !empty(l:project_root) ? fnamemodify(l:project_root, ':h') : ''
endfunction endfunction

0
test/command_callback/cquery_paths/with_compile_commands_json/compile_commands.json Normal file
View file

0
test/command_callback/cquery_paths/with_cquery/.cquery Normal file
View file

33
test/command_callback/test_c_cquery_command_callbacks.vader Normal file
View file

@ -0,0 +1,33 @@
Before:
call ale#assert#SetUpLinterTest('c', 'cquery')
After:
call ale#assert#TearDownLinterTest()
Execute(The project root should be detected correctly using compile_commands.json file):
AssertLSPProject ''
call ale#test#SetFilename('cquery_paths/with_compile_commands_json/dummy.c')
AssertLSPProject ale#path#Simplify(g:dir . '/cquery_paths/with_compile_commands_json')
Execute(The project root should be detected correctly using .cquery file):
AssertLSPProject ''
call ale#test#SetFilename('cquery_paths/with_cquery/dummy.c')
AssertLSPProject ale#path#Simplify(g:dir . '/cquery_paths/with_cquery')
Execute(The executable should be configurable):
AssertLinter 'cquery', ale#Escape('cquery')
let b:ale_c_cquery_executable = 'foobar'
AssertLinter 'foobar', ale#Escape('foobar')
Execute(The cache directory should be configurable):
AssertLSPOptions {'cacheDirectory': expand('$HOME/.cache/cquery')}
let b:ale_c_cquery_cache_directory = '/foo/bar'
AssertLSPOptions {'cacheDirectory': '/foo/bar'}

14
test/command_callback/test_cpp_cquery_command_callbacks.vader
View file

@ -7,6 +7,20 @@ Before:
After: After:
call ale#assert#TearDownLinterTest() call ale#assert#TearDownLinterTest()
Execute(The project root should be detected correctly using compile_commands.json file):
AssertLSPProject ''
call ale#test#SetFilename('cquery_paths/with_compile_commands_json/dummy.cpp')
AssertLSPProject ale#path#Simplify(g:dir . '/cquery_paths/with_compile_commands_json')
Execute(The project root should be detected correctly using .cquery file):
AssertLSPProject ''
call ale#test#SetFilename('cquery_paths/with_cquery/dummy.cpp')
AssertLSPProject ale#path#Simplify(g:dir . '/cquery_paths/with_cquery')
Execute(The executable should be configurable): Execute(The executable should be configurable):
AssertLinter 'cquery', ale#Escape('cquery') AssertLinter 'cquery', ale#Escape('cquery')