Fix #2421 - Use compile_commands.json in build dirs to find roots

1 files changed, 6 insertions, 4 deletions

diff --git a/ale_linters/cpp/cquery.vim b/ale_linters/cpp/cquery.vim
index 0dd9f6ad..2971cdcb 100644
--- a/ale_linters/cpp/cquery.vim
+++ b/ale_linters/cpp/cquery.vim
@@ -5,13 +5,15 @@ call ale#Set('cpp_cquery_executable', 'cquery')
 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')
+    " Try to find cquery configuration files first.
+    let l:config = ale#path#FindNearestFile(a:buffer, '.cquery')
 
-    if empty(l:project_root)
-        let l:project_root = ale#path#FindNearestFile(a:buffer, '.cquery')
+    if !empty(l:config)
+        return fnamemodify(l:config, ':h')
     endif
 
-    return !empty(l:project_root) ? fnamemodify(l:project_root, ':h') : ''
+    " Fall back on default project root detection.
+    return ale#c#FindProjectRoot(a:buffer)
 endfunction
 
 function! ale_linters#cpp#cquery#GetInitializationOptions(buffer) abort