Merge remote-tracking branch 'upstream/master'

ale_linters/cpp/clangcheck.vim

@@ -20,7 +20,7 @@ function! ale_linters#cpp#clangcheck#GetCommand(buffer) abort
     " being generated. These are only added if no build directory can be
     " detected.
     return '%e -analyze %s'
-    \   . (empty(l:build_dir) ? ' -extra-arg -Xclang -extra-arg -analyzer-output=text' : '')
+    \   . (empty(l:build_dir) ? ' --extra-arg=-Xclang --extra-arg=-analyzer-output=text --extra-arg=-fno-color-diagnostics': '')
     \   . ale#Pad(l:user_options)
     \   . (!empty(l:build_dir) ? ' -p ' . ale#Escape(l:build_dir) : '')
 endfunction

ale_linters/php/psalm.vim

@@ -2,6 +2,7 @@
 " Description: plugin for Psalm, static analyzer for PHP
 
 call ale#Set('psalm_langserver_executable', 'psalm')
+call ale#Set('psalm_langserver_options', '')
 call ale#Set('psalm_langserver_use_global', get(g:, 'ale_use_global_executables', 0))
 
 function! ale_linters#php#psalm#GetProjectRoot(buffer) abort
@@ -10,12 +11,16 @@ function! ale_linters#php#psalm#GetProjectRoot(buffer) abort
     return !empty(l:git_path) ? fnamemodify(l:git_path, ':h:h') : ''
 endfunction
 
+function! ale_linters#php#psalm#GetCommand(buffer) abort
+    return '%e --language-server' . ale#Pad(ale#Var(a:buffer, 'psalm_langserver_options'))
+endfunction
+
 call ale#linter#Define('php', {
 \   'name': 'psalm',
 \   'lsp': 'stdio',
 \   'executable': {b -> ale#node#FindExecutable(b, 'psalm_langserver', [
 \       'vendor/bin/psalm',
 \   ])},
-\   'command': '%e --language-server',
+\   'command': function('ale_linters#php#psalm#GetCommand'),
 \   'project_root': function('ale_linters#php#psalm#GetProjectRoot'),
 \})