diff options
| author | D. Ben Knoble <ben.knoble+github@gmail.com> | 2020-10-08 11:55:39 -0400 |
|---|---|---|
| committer | D. Ben Knoble <ben.knoble+github@gmail.com> | 2020-10-08 11:55:39 -0400 |
| commit | 47da7483d8d4bbbe4022b9c0821d3a7d2d0afaaf (patch) | |
| tree | 2dd8365ccdb1b40df30bf89bf63ded6d007db7cb /ale_linters | |
| parent | 3410c1b1e298b8dcde2e7657a587fbaf4a007fec (diff) | |
| parent | b91c6c2edd20794ad5637b561ed4c678647a76e5 (diff) | |
| download | ale-47da7483d8d4bbbe4022b9c0821d3a7d2d0afaaf.zip | |
Merge remote-tracking branch 'origin/master' into fix-swipl
* origin/master:
Add tests for maven.vim file
Fix grammatical error in doc
Add maven helper file; use maven wrapper if available instead of global 'mvn' executable
fix lint, fix variable semantics and update tests
bibclean: update matchlist reges for bibclean > v2.11.4
Update rubocop_auto_correct_all tag
Diffstat (limited to 'ale_linters')
| -rw-r--r-- | ale_linters/bib/bibclean.vim | 7 | ||||
| -rw-r--r-- | ale_linters/java/javac.vim | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/ale_linters/bib/bibclean.vim b/ale_linters/bib/bibclean.vim index 9056a9c3..f1610e00 100644 --- a/ale_linters/bib/bibclean.vim +++ b/ale_linters/bib/bibclean.vim @@ -18,7 +18,12 @@ function! ale_linters#bib#bibclean#get_type(str) abort endfunction function! ale_linters#bib#bibclean#match_msg(line) abort - return matchlist(a:line, '^\(.*\) "stdin", line \(.*\): \(.*\)$') + " Legacy message pattern works for bibclean <= v2.11.4. If empty, try + " the new message pattern for bibtex > v2.11.4 + let l:matches_legacy = matchlist(a:line, '^\(.*\) "stdin", line \(\d\+\): \(.*\)$') + + return ! empty(l:matches_legacy) ? l:matches_legacy + \ : matchlist(a:line, '^\(.*\) stdin:\(\d\+\):\(.*\)$') endfunction function! ale_linters#bib#bibclean#match_entry(line) abort diff --git a/ale_linters/java/javac.vim b/ale_linters/java/javac.vim index f866eb09..a5e57e6c 100644 --- a/ale_linters/java/javac.vim +++ b/ale_linters/java/javac.vim @@ -9,13 +9,7 @@ call ale#Set('java_javac_classpath', '') call ale#Set('java_javac_sourcepath', '') function! ale_linters#java#javac#RunWithImportPaths(buffer) abort - let l:command = '' - let l:pom_path = ale#path#FindNearestFile(a:buffer, 'pom.xml') - - if !empty(l:pom_path) && executable('mvn') - let l:command = ale#path#CdString(fnamemodify(l:pom_path, ':h')) - \ . 'mvn dependency:build-classpath' - endif + let l:command = ale#maven#BuildClasspathCommand(a:buffer) " Try to use Gradle if Maven isn't available. if empty(l:command) |