Merge remote-tracking branch 'upstream/master'

ale_linters/bats/shellcheck.vim

@@ -0,0 +1,4 @@
+" Author: Ian2020 <https://github.com/Ian2020>
+" Description: shellcheck linter for bats scripts.
+
+call ale#handlers#shellcheck#DefineLinter('bats')

ale_linters/clojure/clj_kondo.vim

@@ -29,6 +29,6 @@ call ale#linter#Define('clojure', {
 \   'name': 'clj-kondo',
 \   'output_stream': 'stdout',
 \   'executable': 'clj-kondo',
-\   'command': 'clj-kondo --lint %t',
+\   'command': 'clj-kondo --cache --lint %t',
 \   'callback': 'ale_linters#clojure#clj_kondo#HandleCljKondoFormat',
 \})

ale_linters/go/revive.vim

@@ -0,0 +1,21 @@
+" Author: Penghui Liao <liaoishere@gmail.com>
+" Description: Adds support for revive
+
+call ale#Set('go_revive_executable', 'revive')
+call ale#Set('go_revive_options', '')
+
+function! ale_linters#go#revive#GetCommand(buffer) abort
+    let l:options = ale#Var(a:buffer, 'go_revive_options')
+
+    return ale#go#EnvString(a:buffer) . '%e'
+    \   . (!empty(l:options) ? ' ' . l:options : '')
+    \   . ' %t'
+endfunction
+
+call ale#linter#Define('go', {
+\   'name': 'revive',
+\   'output_stream': 'both',
+\   'executable': {b -> ale#Var(b, 'go_revive_executable')},
+\   'command': function('ale_linters#go#revive#GetCommand'),
+\   'callback': 'ale#handlers#unix#HandleAsWarning',
+\})

ale_linters/graphql/eslint.vim

@@ -5,5 +5,5 @@ call ale#linter#Define('graphql', {
 \   'name': 'eslint',
 \   'executable': function('ale#handlers#eslint#GetExecutable'),
 \   'command': function('ale#handlers#eslint#GetCommand'),
-\   'callback': 'ale#handlers#eslint#Handle',
+\   'callback': 'ale#handlers#eslint#HandleJSON',
 \})

ale_linters/java/eclipselsp.vim

@@ -7,6 +7,7 @@ call ale#Set('java_eclipselsp_path', ale#path#Simplify($HOME . '/eclipse.jdt.ls'
 call ale#Set('java_eclipselsp_config_path', '')
 call ale#Set('java_eclipselsp_workspace_path', '')
 call ale#Set('java_eclipselsp_executable', 'java')
+call ale#Set('java_eclipselsp_javaagent', '')
 
 function! ale_linters#java#eclipselsp#Executable(buffer) abort
     return ale#Var(a:buffer, 'java_eclipselsp_executable')
@@ -100,12 +101,30 @@ function! ale_linters#java#eclipselsp#WorkspacePath(buffer) abort
     return ale#path#Dirname(ale#java#FindProjectRoot(a:buffer))
 endfunction
 
+function! ale_linters#java#eclipselsp#Javaagent(buffer) abort
+    let l:rets = []
+    let l:raw = ale#Var(a:buffer, 'java_eclipselsp_javaagent')
+
+    if empty(l:raw)
+        return ''
+    endif
+
+    let l:jars = split(l:raw)
+
+    for l:jar in l:jars
+        call add(l:rets, ale#Escape('-javaagent:' . l:jar))
+    endfor
+
+    return join(l:rets, ' ')
+endfunction
+
 function! ale_linters#java#eclipselsp#Command(buffer, version) abort
     let l:path = ale#Var(a:buffer, 'java_eclipselsp_path')
 
     let l:executable = ale_linters#java#eclipselsp#Executable(a:buffer)
 
     let l:cmd = [ ale#Escape(l:executable),
+    \ ale_linters#java#eclipselsp#Javaagent(a:buffer),
     \ '-Declipse.application=org.eclipse.jdt.ls.core.id1',
     \ '-Dosgi.bundles.defaultStartLevel=4',
     \ '-Declipse.product=org.eclipse.jdt.ls.core.product',

ale_linters/java/javac.vim

@@ -6,6 +6,7 @@ let s:classpath_sep = has('unix') ? ':' : ';'
 call ale#Set('java_javac_executable', 'javac')
 call ale#Set('java_javac_options', '')
 call ale#Set('java_javac_classpath', '')
+call ale#Set('java_javac_sourcepath', '')
 
 function! ale_linters#java#javac#RunWithImportPaths(buffer) abort
     let l:command = ''
@@ -40,10 +41,15 @@ endfunction
 function! s:BuildClassPathOption(buffer, import_paths) abort
     " Filter out lines like [INFO], etc.
     let l:class_paths = filter(a:import_paths[:], 'v:val !~# ''[''')
-    call extend(
-    \   l:class_paths,
-    \   split(ale#Var(a:buffer, 'java_javac_classpath'), s:classpath_sep),
-    \)
+    let l:cls_path = ale#Var(a:buffer, 'java_javac_classpath')
+
+    if !empty(l:cls_path) && type(l:cls_path) is v:t_string
+        call extend(l:class_paths, split(l:cls_path, s:classpath_sep))
+    endif
+
+    if !empty(l:cls_path) && type(l:cls_path) is v:t_list
+        call extend(l:class_paths, l:cls_path)
+    endif
 
     return !empty(l:class_paths)
     \   ? '-cp ' . ale#Escape(join(l:class_paths, s:classpath_sep))
@@ -79,6 +85,27 @@ function! ale_linters#java#javac#GetCommand(buffer, import_paths, meta) abort
         endif
     endif
 
+    let l:source_paths = []
+    let l:source_path = ale#Var(a:buffer, 'java_javac_sourcepath')
+
+    if !empty(l:source_path) && type(l:source_path) is v:t_string
+        let l:source_paths = split(l:source_path, s:classpath_sep)
+    endif
+
+    if !empty(l:source_path) && type(l:source_path) is v:t_list
+        let l:source_paths = l:source_path
+    endif
+
+    if !empty(l:source_paths)
+        for l:path in l:source_paths
+            let l:sp_path = ale#path#FindNearestDirectory(a:buffer, l:path)
+
+            if !empty(l:sp_path)
+                call add(l:sp_dirs, l:sp_path)
+            endif
+        endfor
+    endif
+
     if !empty(l:sp_dirs)
         let l:sp_option = '-sourcepath '
         \   . ale#Escape(join(l:sp_dirs, s:classpath_sep))

ale_linters/javascript/standard.vim

@@ -7,6 +7,7 @@ call ale#Set('javascript_standard_options', '')
 
 function! ale_linters#javascript#standard#GetExecutable(buffer) abort
     return ale#node#FindExecutable(a:buffer, 'javascript_standard', [
+    \   'node_modules/standardx/bin/cmd.js',
     \   'node_modules/standard/bin/cmd.js',
     \   'node_modules/semistandard/bin/cmd.js',
     \   'node_modules/.bin/standard',

ale_linters/kotlin/kotlinc.vim

@@ -174,6 +174,7 @@ endfunction
 call ale#linter#Define('kotlin', {
 \   'name': 'kotlinc',
 \   'executable': 'kotlinc',
+\   'output_stream': 'stderr',
 \   'command': function('ale_linters#kotlin#kotlinc#RunWithImportPaths'),
 \   'callback': 'ale_linters#kotlin#kotlinc#Handle',
 \   'lint_file': 1,

ale_linters/powershell/powershell.vim

@@ -12,6 +12,7 @@ endfunction
 " https://rkeithhill.wordpress.com/2007/10/30/powershell-quicktip-preparsing-scripts-to-check-for-syntax-errors/
 function! ale_linters#powershell#powershell#GetCommand(buffer) abort
     let l:script = ['Param($Script);
+    \   $ErrorView = "Normal";
     \   trap {$_;continue} & {
     \   $Contents = Get-Content -Path $Script;
     \   $Contents = [string]::Join([Environment]::NewLine, $Contents);

ale_linters/python/mypy.vim

@@ -3,6 +3,7 @@
 
 call ale#Set('python_mypy_executable', 'mypy')
 call ale#Set('python_mypy_ignore_invalid_syntax', 0)
+call ale#Set('python_mypy_show_notes', 1)
 call ale#Set('python_mypy_options', '')
 call ale#Set('python_mypy_use_global', get(g:, 'ale_use_global_executables', 0))
 call ale#Set('python_mypy_auto_pipenv', 0)
@@ -18,6 +19,15 @@ endfunction
 
 " The directory to change to before running mypy
 function! s:GetDir(buffer) abort
+    " If we find a directory with "mypy.ini" in it use that,
+    " else try and find the "python project" root, or failing
+    " that, run from the same folder as the current file
+    for l:path in ale#path#Upwards(expand('#' . a:buffer . ':p:h'))
+        if filereadable(l:path . '/mypy.ini')
+            return l:path
+        endif
+    endfor
+
     let l:project_root = ale#python#FindProjectRoot(a:buffer)
 
     return !empty(l:project_root)
@@ -51,7 +61,16 @@ function! ale_linters#python#mypy#Handle(buffer, lines) abort
     " Lines like these should be ignored below:
     "
     " file.py:4: note: (Stub files are from https://github.com/python/typeshed)
-    let l:pattern = '\v^([a-zA-Z]?:?[^:]+):(\d+):?(\d+)?: (error|warning): (.+)$'
+
+    let l:types = 'error|warning'
+
+    if ale#Var(a:buffer, 'python_mypy_show_notes')
+        let l:types = 'error|warning|note'
+    endif
+
+    let l:pattern = '\v^([a-zA-Z]?:?[^:]+):(\d+):?(\d+)?: ('
+    \   . l:types
+    \   . '): (.+)$'
     let l:output = []
 
     for l:match in ale#util#GetMatches(a:lines, l:pattern)
@@ -65,7 +84,7 @@ function! ale_linters#python#mypy#Handle(buffer, lines) abort
         \   'filename': ale#path#GetAbsPath(l:dir, l:match[1]),
         \   'lnum': l:match[2] + 0,
         \   'col': l:match[3] + 0,
-        \   'type': l:match[4] is# 'error' ? 'E' : 'W',
+        \   'type': l:match[4] is# 'error' ? 'E' : (l:match[4] is# 'note' ? 'I': 'W'),
         \   'text': l:match[5],
         \})
     endfor

ale_linters/rust/analyzer.vim

@@ -0,0 +1,24 @@
+" Author: Jon Gjengset <jon@thesquareplanet.com>
+" Description: The next generation language server for Rust
+
+call ale#Set('rust_analyzer_executable', 'rust-analyzer')
+call ale#Set('rust_analyzer_config', {})
+
+function! ale_linters#rust#analyzer#GetCommand(buffer) abort
+    return '%e'
+endfunction
+
+function! ale_linters#rust#analyzer#GetProjectRoot(buffer) abort
+    let l:cargo_file = ale#path#FindNearestFile(a:buffer, 'Cargo.toml')
+
+    return !empty(l:cargo_file) ? fnamemodify(l:cargo_file, ':h') : ''
+endfunction
+
+call ale#linter#Define('rust', {
+\   'name': 'analyzer',
+\   'lsp': 'stdio',
+\   'lsp_config': {b -> ale#Var(b, 'rust_analyzer_config')},
+\   'executable': {b -> ale#Var(b, 'rust_analyzer_executable')},
+\   'command': function('ale_linters#rust#analyzer#GetCommand'),
+\   'project_root': function('ale_linters#rust#analyzer#GetProjectRoot'),
+\})

ale_linters/scala/metals.vim

@@ -32,6 +32,8 @@ function! ale_linters#scala#metals#GetProjectRoot(buffer) abort
             \)
         endif
     endfor
+
+    return ''
 endfunction
 
 function! ale_linters#scala#metals#GetCommand(buffer) abort

ale_linters/sh/shellcheck.vim

@@ -1,107 +1,4 @@
 " Author: w0rp <devw0rp@gmail.com>
-" Description: This file adds support for using the shellcheck linter with
-"   shell scripts.
+" Description: shellcheck linter for shell scripts.
 
-" This global variable can be set with a string of comma-separated error
-" codes to exclude from shellcheck. For example:
-"
-" let g:ale_sh_shellcheck_exclusions = 'SC2002,SC2004'
-call ale#Set('sh_shellcheck_exclusions', get(g:, 'ale_linters_sh_shellcheck_exclusions', ''))
-call ale#Set('sh_shellcheck_executable', 'shellcheck')
-call ale#Set('sh_shellcheck_dialect', 'auto')
-call ale#Set('sh_shellcheck_options', '')
-call ale#Set('sh_shellcheck_change_directory', 1)
-
-function! ale_linters#sh#shellcheck#GetDialectArgument(buffer) abort
-    let l:shell_type = ale#handlers#sh#GetShellType(a:buffer)
-
-    if !empty(l:shell_type)
-        " Use the dash dialect for /bin/ash, etc.
-        if l:shell_type is# 'ash'
-            return 'dash'
-        endif
-
-        return l:shell_type
-    endif
-
-    " If there's no hashbang, try using Vim's buffer variables.
-    if getbufvar(a:buffer, 'is_bash', 0)
-        return 'bash'
-    elseif getbufvar(a:buffer, 'is_sh', 0)
-        return 'sh'
-    elseif getbufvar(a:buffer, 'is_kornshell', 0)
-        return 'ksh'
-    endif
-
-    return ''
-endfunction
-
-function! ale_linters#sh#shellcheck#GetCommand(buffer, version) abort
-    let l:options = ale#Var(a:buffer, 'sh_shellcheck_options')
-    let l:exclude_option = ale#Var(a:buffer, 'sh_shellcheck_exclusions')
-    let l:dialect = ale#Var(a:buffer, 'sh_shellcheck_dialect')
-    let l:external_option = ale#semver#GTE(a:version, [0, 4, 0]) ? ' -x' : ''
-    let l:cd_string = ale#Var(a:buffer, 'sh_shellcheck_change_directory')
-    \   ? ale#path#BufferCdString(a:buffer)
-    \   : ''
-
-    if l:dialect is# 'auto'
-        let l:dialect = ale_linters#sh#shellcheck#GetDialectArgument(a:buffer)
-    endif
-
-    return l:cd_string
-    \   . '%e'
-    \   . (!empty(l:dialect) ? ' -s ' . l:dialect : '')
-    \   . (!empty(l:options) ? ' ' . l:options : '')
-    \   . (!empty(l:exclude_option) ? ' -e ' . l:exclude_option : '')
-    \   . l:external_option
-    \   . ' -f gcc -'
-endfunction
-
-function! ale_linters#sh#shellcheck#Handle(buffer, lines) abort
-    let l:pattern = '\v^([a-zA-Z]?:?[^:]+):(\d+):(\d+)?:? ([^:]+): (.+) \[([^\]]+)\]$'
-    let l:output = []
-
-    for l:match in ale#util#GetMatches(a:lines, l:pattern)
-        if l:match[4] is# 'error'
-            let l:type = 'E'
-        elseif l:match[4] is# 'note'
-            let l:type = 'I'
-        else
-            let l:type = 'W'
-        endif
-
-        let l:item = {
-        \   'lnum': str2nr(l:match[2]),
-        \   'type': l:type,
-        \   'text': l:match[5],
-        \   'code': l:match[6],
-        \}
-
-        if !empty(l:match[3])
-            let l:item.col = str2nr(l:match[3])
-        endif
-
-        " If the filename is something like <stdin>, <nofile> or -, then
-        " this is an error for the file we checked.
-        if l:match[1] isnot# '-' && l:match[1][0] isnot# '<'
-            let l:item['filename'] = l:match[1]
-        endif
-
-        call add(l:output, l:item)
-    endfor
-
-    return l:output
-endfunction
-
-call ale#linter#Define('sh', {
-\   'name': 'shellcheck',
-\   'executable': {buffer -> ale#Var(buffer, 'sh_shellcheck_executable')},
-\   'command': {buffer -> ale#semver#RunWithVersionCheck(
-\       buffer,
-\       ale#Var(buffer, 'sh_shellcheck_executable'),
-\       '%e --version',
-\       function('ale_linters#sh#shellcheck#GetCommand'),
-\   )},
-\   'callback': 'ale_linters#sh#shellcheck#Handle',
-\})
+call ale#handlers#shellcheck#DefineLinter('sh')

ale_linters/terraform/terraform_lsp.vim

@@ -0,0 +1,25 @@
+" Author: OJFord <dev@ojford.com>
+" Description: terraform-lsp integration for ALE (cf. https://github.com/juliosueiras/terraform-lsp)
+
+call ale#Set('terraform_langserver_executable', 'terraform-lsp')
+call ale#Set('terraform_langserver_options', '')
+
+function! ale_linters#terraform#terraform_lsp#GetCommand(buffer) abort
+    return '%e'
+    \   . ale#Pad(ale#Var(a:buffer, 'terraform_langserver_options'))
+endfunction
+
+function! ale_linters#terraform#terraform_lsp#GetProjectRoot(buffer) abort
+    let l:tf_dir = ale#path#FindNearestDirectory(a:buffer, '.terraform')
+
+    return !empty(l:tf_dir) ? fnamemodify(l:tf_dir, ':h:h') : ''
+endfunction
+
+call ale#linter#Define('terraform', {
+\   'name': 'terraform_lsp',
+\   'lsp': 'stdio',
+\   'executable': {b -> ale#Var(b, 'terraform_langserver_executable')},
+\   'command': function('ale_linters#terraform#terraform_lsp#GetCommand'),
+\   'project_root': function('ale_linters#terraform#terraform_lsp#GetProjectRoot'),
+\   'language': 'terraform',
+\})

ale_linters/typescript/standard.vim

@@ -0,0 +1,31 @@
+" Author: Ahmed El Gabri <@ahmedelgabri>
+" Description: standardjs for typescript files
+
+call ale#Set('typescript_standard_executable', 'standard')
+call ale#Set('typescript_standard_use_global', get(g:, 'ale_use_global_executables', 0))
+call ale#Set('typescript_standard_options', '')
+
+function! ale_linters#typescript#standard#GetExecutable(buffer) abort
+    return ale#node#FindExecutable(a:buffer, 'typescript_standard', [
+    \   'node_modules/standardx/bin/cmd.js',
+    \   'node_modules/standard/bin/cmd.js',
+    \   'node_modules/.bin/standard',
+    \])
+endfunction
+
+function! ale_linters#typescript#standard#GetCommand(buffer) abort
+    let l:executable = ale_linters#typescript#standard#GetExecutable(a:buffer)
+    let l:options = ale#Var(a:buffer, 'typescript_standard_options')
+
+    return ale#node#Executable(a:buffer, l:executable)
+    \   . (!empty(l:options) ? ' ' . l:options : '')
+    \   . ' --stdin %s'
+endfunction
+
+" standard uses eslint and the output format is the same
+call ale#linter#Define('typescript', {
+\   'name': 'standard',
+\   'executable': function('ale_linters#typescript#standard#GetExecutable'),
+\   'command': function('ale_linters#typescript#standard#GetCommand'),
+\   'callback': 'ale#handlers#eslint#Handle',
+\})

ale_linters/verilog/verilator.vim

@@ -28,21 +28,30 @@ function! ale_linters#verilog#verilator#Handle(buffer, lines) abort
     " %Warning-UNDRIVEN: test.v:3: Signal is not driven: clk
     " %Warning-UNUSED: test.v:4: Signal is not used: dout
     " %Warning-BLKSEQ: test.v:10: Blocking assignments (=) in sequential (flop or latch) block; suggest delayed assignments (<=).
-    let l:pattern = '^%\(Warning\|Error\)[^:]*:\([^:]\+\):\(\d\+\): \(.\+\)$'
+    " Since version 4.032 (04/2020) verilator linter messages also contain the column number,
+    " and look like:
+    " %Error: /tmp/test.sv:3:1: syntax error, unexpected endmodule, expecting ';'
+    "
+    " to stay compatible with old versions of the tool, the column number is
+    " optional in the researched pattern
+    let l:pattern = '^%\(Warning\|Error\)[^:]*:\([^:]\+\):\(\d\+\):\(\d\+\)\?:\? \(.\+\)$'
     let l:output = []
 
     for l:match in ale#util#GetMatches(a:lines, l:pattern)
-        let l:line = l:match[3] + 0
-        let l:type = l:match[1] is# 'Error' ? 'E' : 'W'
-        let l:text = l:match[4]
+        let l:item = {
+        \   'lnum': str2nr(l:match[3]),
+        \   'text': l:match[5],
+        \   'type': l:match[1] is# 'Error' ? 'E' : 'W',
+        \}
+
+        if !empty(l:match[4])
+            let l:item.col = str2nr(l:match[4])
+        endif
+
         let l:file = l:match[2]
 
         if l:file =~# '_verilator_linted.v'
-            call add(l:output, {
-            \   'lnum': l:line,
-            \   'text': l:text,
-            \   'type': l:type,
-            \})
+            call add(l:output, l:item)
         endif
     endfor
 

ale_linters/vim/vimls.vim

@@ -0,0 +1,61 @@
+" Author: Jeffrey Lau - https://github.com/zoonfafer
+" Description: Vim Language Server integration for ALE
+
+call ale#Set('vim_vimls_executable', 'vim-language-server')
+call ale#Set('vim_vimls_use_global', get(g:, 'ale_use_global_executables', 0))
+call ale#Set('vim_vimls_config', {})
+
+function! ale_linters#vim#vimls#GetProjectRoot(buffer) abort
+    let l:trigger_file_candidates = [
+    \   '.vimrc',
+    \   'init.vim',
+    \]
+
+    for l:candidate in l:trigger_file_candidates
+        let l:trigger_file = fnamemodify(bufname(a:buffer), ':t')
+
+        if l:trigger_file is# l:candidate
+            return fnamemodify(
+            \   bufname(a:buffer),
+            \   ':h',
+            \)
+        endif
+    endfor
+
+    let l:trigger_dir_candidates = [
+    \   'autoload',
+    \   'plugin',
+    \   '.git',
+    \]
+
+    let l:path_upwards = ale#path#Upwards(fnamemodify(bufname(a:buffer), ':p:h'))
+
+    for l:path in l:path_upwards
+        for l:candidate in l:trigger_dir_candidates
+            let l:trigger_dir = ale#path#Simplify(
+            \   l:path . '/' . l:candidate,
+            \)
+
+            if isdirectory(l:trigger_dir)
+                return fnamemodify(
+                \   l:trigger_dir,
+                \   ':p:h:h',
+                \)
+            endif
+        endfor
+    endfor
+
+    return ''
+endfunction
+
+call ale#linter#Define('vim', {
+\   'name': 'vimls',
+\   'lsp': 'stdio',
+\   'lsp_config': {b -> ale#Var(b, 'vim_vimls_config')},
+\   'executable': {b -> ale#node#FindExecutable(b, 'vim_vimls', [
+\       'node_modules/.bin/vim-language-server',
+\   ])},
+\   'command': '%e --stdio',
+\   'language': 'vim',
+\   'project_root': function('ale_linters#vim#vimls#GetProjectRoot'),
+\})