Merge remote-tracking branch 'upstream/master'

* upstream/master:
  feat(markdown): add rumdl server and fixer (dense-analysis#5115)
  fix(terraform-ls): return current buffer dir when missing .terraform (dense-analysis#5103)
  fix expert lsp stdio and register capability (dense-analysis#5113)
  Add support for PerlNavigator (dense-analysis#5028)
  Use ale#Pad for option padding across the codebase (dense-analysis#5118)
  Add support for LilyPond syntax (dense-analysis#5117)
  feat: Load Prettier from cjs also
  fix(tests): fix ale_c_build_dir_names being unset in tests (dense-analysis#5109)

Author: hsanson

ale_linters/elixir/expert.vim

@@ -7,6 +7,6 @@ call ale#linter#Define('elixir', {
 \   'name': 'expert',
 \   'lsp': 'stdio',
 \   'executable': {b -> ale#Var(b, 'elixir_expert_executable')},
-\   'command': '%e',
+\   'command': '%e --stdio',
 \   'project_root': function('ale#handlers#elixir#FindMixUmbrellaRoot'),
 \})

ale_linters/lilypond/lilypond.vim

@@ -0,0 +1,40 @@
+" Author: Sam Bottoni
+" Description: lilypond linter for LilyPond files
+
+call ale#Set('lilypond_lilypond_executable', 'lilypond')
+
+let g:ale_lilypond_lilypond_options = get(g:, 'ale_lilypond_lilypond_options', '')
+
+function! ale_linters#lilypond#lilypond#GetCommand(buffer) abort
+    return '%e --loglevel=WARNING -dbackend=null -dno-print-pages -o /tmp'
+    \   . ale#Pad(ale#Var(a:buffer, 'lilypond_lilypond_options'))
+    \   . ' %t 2>&1'
+endfunction
+
+function! ale_linters#lilypond#lilypond#Handle(buffer, lines) abort
+    let l:output = []
+
+    for l:line in a:lines
+        " Match: file:line:col: error|warning|programming error: message
+        let l:match = matchlist(l:line,
+        \   '\v^.*:(\d+):(\d+): (error|warning|programming error): (.*)$')
+
+        if !empty(l:match)
+            call add(l:output, {
+            \   'lnum': str2nr(l:match[1]),
+            \   'col': str2nr(l:match[2]),
+            \   'type': l:match[3] =~? 'error' ? 'E' : 'W',
+            \   'text': l:match[4]
+            \})
+        endif
+    endfor
+
+    return l:output
+endfunction
+
+call ale#linter#Define('lilypond', {
+\   'name': 'lilypond',
+\   'executable': {b -> ale#Var(b, 'lilypond_lilypond_executable')},
+\   'command': function('ale_linters#lilypond#lilypond#GetCommand'),
+\   'callback': 'ale_linters#lilypond#lilypond#Handle',
+\})

ale_linters/markdown/rumdl.vim

@@ -0,0 +1,48 @@
+" Author: Evan Chen <evan@evanchen.cc>
+" Description: Fast Markdown linter and formatter written in Rust
+
+
+call ale#Set('markdown_rumdl_executable', 'rumdl')
+call ale#Set('markdown_rumdl_options', '')
+
+function! ale_linters#markdown#rumdl#GetProjectRoot(buffer) abort
+    let l:dotconfig = ale#path#FindNearestFile(a:buffer, '.rumdl.toml')
+    let l:config = ale#path#FindNearestFile(a:buffer, 'rumdl.toml')
+
+    if !empty(l:dotconfig) && !empty(l:config)
+        let l:nearest = len(l:dotconfig) >= len(l:config) ? l:dotconfig : l:config
+
+        return fnamemodify(l:nearest, ':h')
+    elseif !empty(l:dotconfig)
+        return fnamemodify(l:dotconfig, ':h')
+    elseif !empty(l:config)
+        return fnamemodify(l:config, ':h')
+    endif
+
+    " Try to find nearest pyproject.toml
+    let l:pyproject_file = ale#path#FindNearestFile(a:buffer, 'pyproject.toml')
+
+    if !empty(l:pyproject_file)
+        return fnamemodify(l:pyproject_file . '/', ':p:h:h')
+    endif
+
+    " Try to find nearest `git` directory
+    let l:gitdir = ale#path#FindNearestFile(a:buffer, '.git')
+
+    if !empty(l:gitdir)
+        return fnamemodify(l:gitdir . '/', ':p:h:h')
+    endif
+
+    return fnamemodify(bufname(a:buffer), ':p:h')
+endfunction
+
+call ale#linter#Define('markdown', {
+\   'name': 'rumdl',
+\   'lsp': 'stdio',
+\   'executable': {b -> ale#Var(b, 'markdown_rumdl_executable')},
+\   'command': {b -> ale#Escape(ale#Var(b, 'markdown_rumdl_executable'))
+\       . ' server --stdio'
+\       . ale#Pad(ale#Var(b, 'markdown_rumdl_options'))},
+\   'project_root': function('ale_linters#markdown#rumdl#GetProjectRoot'),
+\   'language': 'markdown',
+\})

ale_linters/perl/languageserver.vim

@@ -5,29 +5,6 @@
 call ale#Set('perl_perl_executable', 'perl')
 " Please note that perl_perl_options does not exist here.
 
-function! ale_linters#perl#languageserver#GetProjectRoot(buffer) abort
-    " Makefile.PL, https://perldoc.perl.org/ExtUtils::MakeMaker
-    " Build.PL, https://metacpan.org/pod/Module::Build
-    " dist.ini, https://metacpan.org/pod/Dist::Zilla
-    let l:potential_roots = [ 'Makefile.PL', 'Build.PL', 'dist.ini' ]
-
-    for l:root in l:potential_roots
-        let l:project_root = ale#path#FindNearestFile(a:buffer, l:root)
-
-        if !empty(l:project_root)
-            return fnamemodify(l:project_root . '/', ':p:h:h')
-        endif
-    endfor
-
-    let l:project_root = ale#path#FindNearestFileOrDirectory(a:buffer, '.git')
-
-    if !empty(l:project_root)
-        return fnamemodify(l:project_root . '/', ':p:h:h')
-    endif
-
-    return fnamemodify(expand('#' . a:buffer . ':p:h'), ':p:h')
-endfunction
-
 call ale#Set('perl_languageserver_config', {})
 
 function! s:get_lsp_config(buffer) abort
@@ -45,5 +22,5 @@ call ale#linter#Define('perl', {
 \   'executable': {b -> ale#Var(b, 'perl_perl_executable')},
 \   'command': '%e -MPerl::LanguageServer -ePerl::LanguageServer::run',
 \   'lsp_config': {b -> s:get_lsp_config(b)},
-\   'project_root': function('ale_linters#perl#languageserver#GetProjectRoot'),
+\   'project_root': function('ale#handlers#perl#GetProjectRoot'),
 \ })

ale_linters/perl/perlnavigator.vim

@@ -0,0 +1,15 @@
+" Author: rymdbar <https://rymdbar.x20.se/>
+" Description: Perl Navigator Language Server
+" See: https://github.com/bscan/PerlNavigator
+
+call ale#Set('perl_perlnavigator_config', {})
+call ale#Set('perl_perlnavigator_executable', 'perlnavigator')
+
+call ale#linter#Define('perl', {
+\   'name': 'perlnavigator',
+\   'lsp': 'stdio',
+\   'executable': {b -> ale#Var(b, 'perl_perlnavigator_executable')},
+\   'command': '%e --stdio',
+\   'lsp_config': {b -> ale#Var(b, 'perl_perlnavigator_config')},
+\   'project_root': function('ale#handlers#perl#GetProjectRoot'),
+\ })

ale_linters/terraform/terraform_ls.vim

@@ -25,6 +25,10 @@ endfunction
 function! ale_linters#terraform#terraform_ls#GetProjectRoot(buffer) abort
     let l:tf_dir = ale#path#FindNearestDirectory(a:buffer, '.terraform')
 
+    if empty(l:tf_dir)
+        let l:tf_dir = ale#path#FindNearestDirectory(a:buffer, '.')
+    endif
+
     return !empty(l:tf_dir) ? fnamemodify(l:tf_dir, ':h:h') : ''
 endfunction
 

autoload/ale/fix/registry.vim

@@ -767,6 +767,11 @@ let s:default_registry = {
 \       'suggested_filetypes': ['markdown'],
 \       'description': 'Fix markdown files with markdownlint.',
 \   },
+\   'rumdl': {
+\       'function': 'ale#fixers#rumdl#Fix',
+\       'suggested_filetypes': ['markdown'],
+\       'description': 'Fix markdown files with rumdl.',
+\   },
 \}
 
 " Reset the function registry to the default entries.

autoload/ale/fixers/alejandra.vim

@@ -7,7 +7,7 @@ function! ale#fixers#alejandra#Fix(buffer) abort
 
     return {
     \   'command': ale#Escape(l:executable)
-    \       . (empty(l:options) ? '' : ' ' . l:options)
+    \       . ale#Pad(l:options)
     \       . ' -- -'
     \}
 endfunction

autoload/ale/fixers/apkbuild_fixer.vim

@@ -12,7 +12,7 @@ function! ale#fixers#apkbuild_fixer#Fix(buffer) abort
     return {
     \   'command': ale#Escape(l:executable)
     \       . ' -p ' . ale#Var(a:buffer, 'apkbuild_apkbuild_fixer_lint_executable')
-    \       . (empty(l:options) ? '' : ' ' . l:options)
+    \       . ale#Pad(l:options)
     \       . ' %t',
     \   'read_temporary_file': 1,
     \}

autoload/ale/fixers/clangtidy.vim

@@ -36,7 +36,7 @@ function! ale#fixers#clangtidy#GetCommand(buffer) abort
 
     return ' -fix' . (l:fix_errors ? ' -fix-errors' : '')
     \   . (empty(l:checks) ? '' : ' -checks=' . ale#Escape(l:checks))
-    \   . (empty(l:extra_options) ? '' : ' ' . l:extra_options)
+    \   . ale#Pad(l:extra_options)
     \   . (empty(l:build_dir) ? '' : ' -p ' . ale#Escape(l:build_dir))
     \   . ' %t' . (empty(l:options) ? '' : ' -- ' . l:options)
 endfunction