Merge remote-tracking branch 'upstream/master'

ale_linters/java/checkstyle.vim

@@ -52,7 +52,7 @@ endfunction
 function! ale_linters#java#checkstyle#GetCommand(buffer) abort
     let l:options = ale#Var(a:buffer, 'java_checkstyle_options')
     let l:config_option = ale#Var(a:buffer, 'java_checkstyle_config')
-    let l:config = l:options !~# '\v(^| )-c' && !empty(l:config_option)
+    let l:config = l:options !~# '\v(^| )-c ' && !empty(l:config_option)
     \   ? s:GetConfig(a:buffer, l:config_option)
     \   : ''
 

ale_linters/java/eclipselsp.vim

@@ -20,25 +20,32 @@ endfunction
 function! ale_linters#java#eclipselsp#JarPath(buffer) abort
     let l:path = ale_linters#java#eclipselsp#TargetPath(a:buffer)
 
-    " Search jar file within repository path when manually built using mvn
-    let l:repo_path = l:path . '/org.eclipse.jdt.ls.product/target/repository'
-    let l:files = globpath(l:repo_path, '**/plugins/org.eclipse.equinox.launcher_\d\.\d\.\d\d\d\.*\.jar', 1, 1)
+    if has('win32')
+        let l:platform = 'win32'
+    elseif has('macunix')
+        let l:platform = 'macosx'
+    else
+        let l:platform = 'linux'
+    endif
 
-    if len(l:files) == 1
+    " Search jar file within repository path when manually built using mvn
+    let l:files = globpath(l:path, '**/'.l:platform.'/**/plugins/org.eclipse.equinox.launcher_\d\.\d\.\d\d\d\.*\.jar', 1, 1)
+
+    if len(l:files) > 1
         return l:files[0]
     endif
 
     " Search jar file within VSCode extensions folder.
-    let l:files = globpath(l:path, '**/plugins/org.eclipse.equinox.launcher_\d\.\d\.\d\d\d\.*\.jar', 1, 1)
+    let l:files = globpath(l:path, '**/'.l:platform.'/plugins/org.eclipse.equinox.launcher_\d\.\d\.\d\d\d\.*\.jar', 1, 1)
 
-    if len(l:files) == 1
+    if len(l:files) > 1
         return l:files[0]
     endif
 
     " Search jar file within system package path
     let l:files = globpath('/usr/share/java/jdtls/plugins', 'org.eclipse.equinox.launcher_\d\.\d\.\d\d\d\.*\.jar', 1, 1)
 
-    if len(l:files) == 1
+    if len(l:files) > 1
         return l:files[0]
     endif
 
@@ -166,7 +173,8 @@ function! ale_linters#java#eclipselsp#RunWithVersionCheck(buffer) abort
     return ale#command#Run(
     \ a:buffer,
     \ l:command,
-    \ function('ale_linters#java#eclipselsp#CommandWithVersion')
+    \ function('ale_linters#java#eclipselsp#CommandWithVersion'),
+    \ { 'output_stream': 'both' }
     \)
 endfunction
 

ale_linters/kotlin/ktlint.vim

@@ -6,5 +6,5 @@ call ale#linter#Define('kotlin', {
 \   'executable': 'ktlint',
 \   'command': function('ale#handlers#ktlint#GetCommand'),
 \   'callback': 'ale#handlers#ktlint#Handle',
-\   'lint_file': 1
+\   'output_stream': 'stderr'
 \})

ale_linters/puppet/puppet.vim

@@ -8,13 +8,15 @@ function! ale_linters#puppet#puppet#Handle(buffer, lines) abort
     " Error: Could not parse for environment production: Syntax error at ':' at /root/puppetcode/modules/nginx/manifests/init.pp:43:12
     " Error: Could not parse for environment production: Syntax error at '='; expected '}' at /root/puppetcode/modules/pancakes/manifests/init.pp:5"
     " Error: Could not parse for environment production: Syntax error at 'parameter1' (file: /tmp/modules/mariadb/manifests/slave.pp, line: 4, column: 5)
-    let l:pattern = '^Error: .*: \(.\+\) \((file:\|at\) .\+\.pp\(, line: \|:\)\(\d\+\)\(, column: \|:\)\=\(\d*\)'
+    " Error: Illegal attempt to assign to 'a Name'. Not an assignable reference (file: /tmp/modules/waffles/manifests/syrup.pp, line: 5, column: 11)
+    " Error: Could not parse for environment production: Syntax error at end of input (file: /tmp/modules/bob/manifests/init.pp)
+    let l:pattern = '^Error:\%(.*:\)\? \(.\+\) \((file:\|at\) .\+\.pp\(\(, line: \|:\)\(\d\+\)\(, column: \|:\)\=\(\d*\)\|)$\)'
     let l:output = []
 
     for l:match in ale#util#GetMatches(a:lines, l:pattern)
         call add(l:output, {
-        \   'lnum': l:match[4] + 0,
-        \   'col': l:match[6] + 0,
+        \   'lnum': l:match[5] + 0,
+        \   'col': l:match[7] + 0,
         \   'text': l:match[1],
         \})
     endfor

ale_linters/sh/bashate.vim

@@ -0,0 +1,43 @@
+" Author: hsanson <hsanson@gmail.com>
+" Description: Lints sh files using bashate
+" URL: https://github.com/openstack/bashate
+
+call ale#Set('sh_bashate_executable', 'bashate')
+call ale#Set('sh_bashate_options', '')
+
+function! ale_linters#sh#bashate#GetExecutable(buffer) abort
+    return ale#Var(a:buffer, 'sh_bashate_executable')
+endfunction
+
+function! ale_linters#sh#bashate#GetCommand(buffer) abort
+    let l:options = ale#Var(a:buffer, 'sh_bashate_options')
+    let l:executable = ale_linters#sh#bashate#GetExecutable(a:buffer)
+
+    return ale#Escape(l:executable) . ' ' . l:options . ' ' . '%t'
+endfunction
+
+function! ale_linters#sh#bashate#Handle(buffer, lines) abort
+    " Matches patterns line the following:
+    "
+    " /path/to/script/file:694:1: E003 Indent not multiple of 4
+    let l:pattern = ':\(\d\+\):\(\d\+\): \(.*\)$'
+    let l:output = []
+
+    for l:match in ale#util#GetMatches(a:lines, l:pattern)
+        call add(l:output, {
+        \   'lnum': str2nr(l:match[1]),
+        \   'col': str2nr(l:match[2]),
+        \   'text': l:match[3],
+        \})
+    endfor
+
+    return l:output
+endfunction
+
+call ale#linter#Define('sh', {
+\   'name': 'bashate',
+\   'output_stream': 'stdout',
+\   'executable': function('ale_linters#sh#bashate#GetExecutable'),
+\   'command': function('ale_linters#sh#bashate#GetCommand'),
+\   'callback': 'ale_linters#sh#bashate#Handle',
+\})

ale_linters/zig/zls.vim

@@ -0,0 +1,20 @@
+" Author: CherryMan <skipper308@hotmail.ca>
+" Description: A language server for Zig
+
+call ale#Set('zig_zls_executable', 'zls')
+call ale#Set('zig_zls_config', {})
+
+function! ale_linters#zig#zls#GetProjectRoot(buffer) abort
+    let l:build_rs = ale#path#FindNearestFile(a:buffer, 'build.zig')
+
+    return !empty(l:build_rs) ? fnamemodify(l:build_rs, ':h') : ''
+endfunction
+
+call ale#linter#Define('zig', {
+\   'name': 'zls',
+\   'lsp': 'stdio',
+\   'lsp_config': {b -> ale#Var(b, 'zig_zls_config')},
+\   'executable': {b -> ale#Var(b, 'zig_zls_executable')},
+\   'command': '%e',
+\   'project_root': function('ale_linters#zig#zls#GetProjectRoot'),
+\})