From 2237f9b4623f0fc5c6b4b70e47171a94b6a30bd4 Mon Sep 17 00:00:00 2001
From: w0rp <devw0rp@gmail.com>
Date: Mon, 10 Aug 2020 02:14:23 +0100
Subject: [PATCH] #2919 Use compile_commands.json for headers

---
 autoload/ale/c.vim                                     |  7 -------
 .../test_c_clang_tidy_command_callback.vader           | 10 +++-------
 .../test_clang_tidy_command_callback.vader             |  9 ++++++---
 .../test_cpp_clazy_command_callback.vader              |  8 +++++---
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/autoload/ale/c.vim b/autoload/ale/c.vim
index 2509db99..39892d42 100644
--- a/autoload/ale/c.vim
+++ b/autoload/ale/c.vim
@@ -9,13 +9,6 @@ let s:sep = has('win32') ? '\' : '/'
 let g:__ale_c_project_filenames = ['.git/HEAD', 'configure', 'Makefile', 'CMakeLists.txt']
 
 function! ale#c#GetBuildDirectory(buffer) abort
-    " Don't include build directory for header files, as compile_commands.json
-    " files don't consider headers to be translation units, and provide no
-    " commands for compiling header files.
-    if expand('#' . a:buffer) =~# '\v\.(h|hpp)$'
-        return ''
-    endif
-
     let l:build_dir = ale#Var(a:buffer, 'c_build_dir')
 
     " c_build_dir has the priority if defined
diff --git a/test/command_callback/test_c_clang_tidy_command_callback.vader b/test/command_callback/test_c_clang_tidy_command_callback.vader
index 5ebbbd45..c4433550 100644
--- a/test/command_callback/test_c_clang_tidy_command_callback.vader
+++ b/test/command_callback/test_c_clang_tidy_command_callback.vader
@@ -57,7 +57,7 @@ Execute(The build directory setting should override the options):
   \   . ' -checks=' . ale#Escape('*') . ' %s'
   \   . ' -p ' . ale#Escape('/foo/bar')
 
-Execute(The build directory should be ignored for header files):
+Execute(The build directory should be used for header files):
   call ale#test#SetFilename('test.h')
 
   let b:ale_c_clangtidy_checks = ['*']
@@ -66,12 +66,8 @@ Execute(The build directory should be ignored for header files):
 
   AssertLinter 'clang-tidy',
   \ ale#Escape('clang-tidy')
-  \   . ' -checks=' . ale#Escape('*') . ' %s -- -Wall'
-
-  call ale#test#SetFilename('test.h')
-
-  AssertLinter 'clang-tidy',
-  \ ale#Escape('clang-tidy') . ' -checks=' . ale#Escape('*') . ' %s -- -Wall'
+  \   . ' -checks=' . ale#Escape('*') . ' %s'
+  \   . ' -p ' . ale#Escape('/foo/bar')
 
 Execute(The executable should be configurable):
   let b:ale_c_clangtidy_checks = ['*']
diff --git a/test/command_callback/test_clang_tidy_command_callback.vader b/test/command_callback/test_clang_tidy_command_callback.vader
index c2d18dea..eb1220be 100644
--- a/test/command_callback/test_clang_tidy_command_callback.vader
+++ b/test/command_callback/test_clang_tidy_command_callback.vader
@@ -57,7 +57,7 @@ Execute(The build directory setting should override the options):
   \   . ' -checks=' . ale#Escape('*') . ' %s'
   \   . ' -p ' . ale#Escape('/foo/bar')
 
-Execute(The build directory should be ignored for header files):
+Execute(The build directory should be used for header files):
   call ale#test#SetFilename('test.h')
 
   let b:ale_cpp_clangtidy_checks = ['*']
@@ -66,12 +66,15 @@ Execute(The build directory should be ignored for header files):
 
   AssertLinter 'clang-tidy',
   \ ale#Escape('clang-tidy')
-  \   . ' -checks=' . ale#Escape('*') . ' %s -- -Wall'
+  \   . ' -checks=' . ale#Escape('*') . ' %s'
+  \   . ' -p ' . ale#Escape('/foo/bar')
 
   call ale#test#SetFilename('test.hpp')
 
   AssertLinter 'clang-tidy',
-  \ ale#Escape('clang-tidy') . ' -checks=' . ale#Escape('*') . ' %s -- -Wall'
+  \ ale#Escape('clang-tidy')
+  \   . ' -checks=' . ale#Escape('*') . ' %s'
+  \   . ' -p ' . ale#Escape('/foo/bar')
 
 Execute(The executable should be configurable):
   let b:ale_cpp_clangtidy_checks = ['*']
diff --git a/test/command_callback/test_cpp_clazy_command_callback.vader b/test/command_callback/test_cpp_clazy_command_callback.vader
index 1be43b96..e5a81b8f 100644
--- a/test/command_callback/test_cpp_clazy_command_callback.vader
+++ b/test/command_callback/test_cpp_clazy_command_callback.vader
@@ -34,18 +34,20 @@ Execute(The build directory should be configurable):
   \ ale#Escape('clazy-standalone')
   \   . ' -checks=' . ale#Escape('level1') . ' -p ' . ale#Escape('/foo/bar') . ' %s'
 
-Execute(The build directory should be ignored for header files):
+Execute(The build directory should be used for header files):
   call ale#test#SetFilename('test.h')
 
   let b:ale_c_build_dir = '/foo/bar'
 
   AssertLinter 'clazy-standalone',
-  \ ale#Escape('clazy-standalone') . ' -checks=' . ale#Escape('level1') . ' %s'
+  \ ale#Escape('clazy-standalone')
+  \   . ' -checks=' . ale#Escape('level1') . ' -p ' . ale#Escape('/foo/bar') . ' %s'
 
   call ale#test#SetFilename('test.hpp')
 
   AssertLinter 'clazy-standalone',
-  \ ale#Escape('clazy-standalone') . ' -checks=' . ale#Escape('level1') . ' %s'
+  \ ale#Escape('clazy-standalone')
+  \   . ' -checks=' . ale#Escape('level1') . ' -p ' . ale#Escape('/foo/bar') . ' %s'
 
 Execute(The executable should be configurable):
   let b:ale_cpp_clazy_executable = 'foobar'