mirror of
https://github.com/dense-analysis/ale.git
synced 2025-12-10 22:41:52 +08:00
Merge pull request #1793 from kodemeister/cquery
Use .cquery file to detect the project root
This commit is contained in:
@@ -6,6 +6,11 @@ call ale#Set('c_cquery_cache_directory', expand('~/.cache/cquery'))
|
||||
|
||||
function! ale_linters#c#cquery#GetProjectRoot(buffer) abort
|
||||
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') : ''
|
||||
endfunction
|
||||
|
||||
|
||||
@@ -7,6 +7,10 @@ call ale#Set('cpp_cquery_cache_directory', expand('~/.cache/cquery'))
|
||||
function! ale_linters#cpp#cquery#GetProjectRoot(buffer) abort
|
||||
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') : ''
|
||||
endfunction
|
||||
|
||||
|
||||
33
test/command_callback/test_c_cquery_command_callbacks.vader
Normal file
33
test/command_callback/test_c_cquery_command_callbacks.vader
Normal 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'}
|
||||
@@ -7,6 +7,20 @@ Before:
|
||||
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.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):
|
||||
AssertLinter 'cquery', ale#Escape('cquery')
|
||||
|
||||
|
||||
Reference in New Issue
Block a user