Merge remote-tracking branch 'upstream/master'

4 files changed, 54 insertions, 14 deletions

diff --git a/ale_linters/handlebars/embertemplatelint.vim b/ale_linters/handlebars/embertemplatelint.vim
index 74bd6a99..31d65b70 100644
--- a/ale_linters/handlebars/embertemplatelint.vim
+++ b/ale_linters/handlebars/embertemplatelint.vim
@@ -4,6 +4,28 @@
 call ale#Set('handlebars_embertemplatelint_executable', 'ember-template-lint')
 call ale#Set('handlebars_embertemplatelint_use_global', get(g:, 'ale_use_global_executables', 0))
 
+function! ale_linters#handlebars#embertemplatelint#GetExecutable(buffer) abort
+    return ale#node#FindExecutable(a:buffer, 'handlebars_embertemplatelint', [
+    \   'node_modules/.bin/ember-template-lint',
+    \])
+endfunction
+
+function! ale_linters#handlebars#embertemplatelint#GetCommand(buffer, version) abort
+    " Reading from stdin was introduced in ember-template-lint@1.6.0
+    return ale#semver#GTE(a:version, [1, 6, 0])
+    \   ? '%e --json --filename %s'
+    \   : '%e --json %t'
+endfunction
+
+function! ale_linters#handlebars#embertemplatelint#GetCommandWithVersionCheck(buffer) abort
+    return ale#semver#RunWithVersionCheck(
+    \       a:buffer,
+    \       ale_linters#handlebars#embertemplatelint#GetExecutable(a:buffer),
+    \       '%e --version',
+    \       function('ale_linters#handlebars#embertemplatelint#GetCommand'),
+    \   )
+endfunction
+
 function! ale_linters#handlebars#embertemplatelint#Handle(buffer, lines) abort
     let l:output = []
     let l:json = ale#util#FuzzyJSONDecode(a:lines, {})
@@ -31,9 +53,7 @@ endfunction
 
 call ale#linter#Define('handlebars', {
 \   'name': 'ember-template-lint',
-\   'executable': {b -> ale#node#FindExecutable(b, 'handlebars_embertemplatelint', [
-\       'node_modules/.bin/ember-template-lint',
-\   ])},
-\   'command': '%e --json %t',
+\   'executable': function('ale_linters#handlebars#embertemplatelint#GetExecutable'),
+\   'command': function('ale_linters#handlebars#embertemplatelint#GetCommandWithVersionCheck'),
 \   'callback': 'ale_linters#handlebars#embertemplatelint#Handle',
 \})
diff --git a/ale_linters/php/psalm.vim b/ale_linters/php/psalm.vim
index ab4dbbc9..286c8a96 100644
--- a/ale_linters/php/psalm.vim
+++ b/ale_linters/php/psalm.vim
@@ -1,9 +1,9 @@
 " Author: Matt Brown <https://github.com/muglug>
 " 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))
+call ale#Set('php_psalm_executable', 'psalm')
+call ale#Set('php_psalm_options', '')
+call ale#Set('php_psalm_use_global', get(g:, 'ale_use_global_executables', 0))
 
 function! ale_linters#php#psalm#GetProjectRoot(buffer) abort
     let l:git_path = ale#path#FindNearestDirectory(a:buffer, '.git')
@@ -12,13 +12,13 @@ function! ale_linters#php#psalm#GetProjectRoot(buffer) abort
 endfunction
 
 function! ale_linters#php#psalm#GetCommand(buffer) abort
-    return '%e --language-server' . ale#Pad(ale#Var(a:buffer, 'psalm_langserver_options'))
+    return '%e --language-server' . ale#Pad(ale#Var(a:buffer, 'php_psalm_options'))
 endfunction
 
 call ale#linter#Define('php', {
 \   'name': 'psalm',
 \   'lsp': 'stdio',
-\   'executable': {b -> ale#node#FindExecutable(b, 'psalm_langserver', [
+\   'executable': {b -> ale#node#FindExecutable(b, 'php_psalm', [
 \       'vendor/bin/psalm',
 \   ])},
 \   'command': function('ale_linters#php#psalm#GetCommand'),
diff --git a/ale_linters/python/flake8.vim b/ale_linters/python/flake8.vim
index e2e7b743..fc4ab692 100644
--- a/ale_linters/python/flake8.vim
+++ b/ale_linters/python/flake8.vim
@@ -4,7 +4,7 @@
 call ale#Set('python_flake8_executable', 'flake8')
 call ale#Set('python_flake8_options', '')
 call ale#Set('python_flake8_use_global', get(g:, 'ale_use_global_executables', 0))
-call ale#Set('python_flake8_change_directory', 1)
+call ale#Set('python_flake8_change_directory', 'project')
 call ale#Set('python_flake8_auto_pipenv', 0)
 
 function! s:UsingModule(buffer) abort
@@ -38,10 +38,30 @@ function! ale_linters#python#flake8#RunWithVersionCheck(buffer) abort
     \)
 endfunction
 
+function! ale_linters#python#flake8#GetCdString(buffer) abort
+    let l:change_directory = ale#Var(a:buffer, 'python_flake8_change_directory')
+    let l:cd_string = ''
+
+    if l:change_directory is# 'project'
+        let l:project_root = ale#python#FindProjectRootIni(a:buffer)
+
+        if !empty(l:project_root)
+            let l:cd_string = ale#path#CdString(l:project_root)
+        endif
+    endif
+
+    if (l:change_directory is# 'project' && empty(l:cd_string))
+    \|| l:change_directory is# 1
+    \|| l:change_directory is# 'file'
+        let l:cd_string = ale#path#BufferCdString(a:buffer)
+    endif
+
+    return l:cd_string
+endfunction
+
 function! ale_linters#python#flake8#GetCommand(buffer, version) abort
-    let l:cd_string = ale#Var(a:buffer, 'python_flake8_change_directory')
-    \   ? ale#path#BufferCdString(a:buffer)
-    \   : ''
+    let l:cd_string = ale_linters#python#flake8#GetCdString(a:buffer)
+
     let l:executable = ale_linters#python#flake8#GetExecutable(a:buffer)
 
     let l:exec_args = l:executable =~? 'pipenv$'
diff --git a/ale_linters/vim/vint.vim b/ale_linters/vim/vint.vim
index 65e19126..c7461bc8 100644
--- a/ale_linters/vim/vint.vim
+++ b/ale_linters/vim/vint.vim
@@ -5,7 +5,7 @@
 call ale#Set('vim_vint_show_style_issues', 1)
 call ale#Set('vim_vint_executable', 'vint')
 let s:enable_neovim = has('nvim') ? ' --enable-neovim' : ''
-let s:format = '-f "{file_path}:{line_number}:{column_number}: {severity}: {description} (see {reference})"'
+let s:format = '-f "{file_path}:{line_number}:{column_number}: {severity}: {policy_name} - {description} (see {reference})"'
 
 function! ale_linters#vim#vint#GetCommand(buffer, version) abort
     let l:can_use_no_color_flag = empty(a:version)