From f4070f6c43b3cb2e7463d8426a68d5a726991288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Borges?= Date: Thu, 17 Oct 2019 17:28:48 +0100 Subject: [PATCH] Add definition of c/clangd's language as C (#2791) * Add definition of c/clangd's language as C * Update tests for clangd to be called with '-x c' * Change to use single quotes instead of double quotes --- ale_linters/c/clangd.vim | 2 +- .../test_c_clangd_command_callbacks.vader | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ale_linters/c/clangd.vim b/ale_linters/c/clangd.vim index 79b600fa..0bb38d43 100644 --- a/ale_linters/c/clangd.vim +++ b/ale_linters/c/clangd.vim @@ -5,7 +5,7 @@ call ale#Set('c_clangd_executable', 'clangd') call ale#Set('c_clangd_options', '') function! ale_linters#c#clangd#GetCommand(buffer) abort - return '%e' . ale#Pad(ale#Var(a:buffer, 'c_clangd_options')) + return '%e -x c' . ale#Pad(ale#Var(a:buffer, 'c_clangd_options')) endfunction call ale#linter#Define('c', { diff --git a/test/command_callback/test_c_clangd_command_callbacks.vader b/test/command_callback/test_c_clangd_command_callbacks.vader index dc52097d..15726163 100644 --- a/test/command_callback/test_c_clangd_command_callbacks.vader +++ b/test/command_callback/test_c_clangd_command_callbacks.vader @@ -4,14 +4,18 @@ Before: Save &filetype let &filetype = 'c' + 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') + AssertLinter 'clangd', ale#Escape('clangd') . b:command_tail Execute(The project root should be detected correctly): call ale#test#SetFilename(tempname() . '/dummy.c') @@ -25,10 +29,10 @@ 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') + AssertLinter 'foobar', ale#Escape('foobar') . b:command_tail Execute(The options should be configurable): let b:ale_c_clangd_options = '-compile-commands-dir=foo' - AssertLinter 'clangd', ale#Escape('clangd') . ' ' . b:ale_c_clangd_options + AssertLinter 'clangd', ale#Escape('clangd') . b:command_tail . ' ' . b:ale_c_clangd_options