Skip to content

Commit 3c83771

Browse files
PsickOSSHPsickOSSHw0rp
authored
feat(rstcheck): Add automatic --config support with version check (#5095)
* Add automatic --config support for rstcheck >= 3.4.0 * Add tests for rstcheck Co-authored-by: PsickOSSH <PsickOSSH@protonmail.com> Co-authored-by: w0rp <devw0rp@gmail.com>
1 parent bee0b49 commit 3c83771

2 files changed

Lines changed: 98 additions & 3 deletions

File tree

ale_linters/rst/rstcheck.vim

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
1-
" Author: John Nduli https://github.com/jnduli
2-
" Description: Rstcheck for reStructuredText files
1+
" Authors:
2+
" John Nduli https://github.com/jnduli,
3+
" Michael Goerz https://github.com/goerz
4+
5+
call ale#Set('rst_rstcheck_executable', 'rstcheck')
6+
call ale#Set('rst_rstcheck_options', '')
7+
8+
function! ale_linters#rst#rstcheck#GetExecutable(buffer) abort
9+
return ale#Var(a:buffer, 'rst_rstcheck_executable')
10+
endfunction
311

412
function! ale_linters#rst#rstcheck#Handle(buffer, lines) abort
513
" matches: 'bad_rst.rst:1: (SEVERE/4) Title overline & underline
@@ -21,11 +29,35 @@ function! ale_linters#rst#rstcheck#Handle(buffer, lines) abort
2129
return l:output
2230
endfunction
2331

32+
function! ale_linters#rst#rstcheck#GetCommand(buffer, version) abort
33+
let l:executable = ale_linters#rst#rstcheck#GetExecutable(a:buffer)
34+
let l:options = ale#Var(a:buffer, 'rst_rstcheck_options')
35+
let l:dir = expand('#' . a:buffer . ':p:h')
36+
let l:exec_args = ale#Pad(l:options)
37+
38+
if ale#semver#GTE(a:version, [3, 4, 0])
39+
let l:exec_args .= ' --config ' . ale#Escape(l:dir)
40+
endif
41+
42+
return ale#Escape(l:executable)
43+
\ . l:exec_args
44+
\ . ' %t'
45+
endfunction
46+
47+
function! ale_linters#rst#rstcheck#GetCommandWithVersionCheck(buffer) abort
48+
return ale#semver#RunWithVersionCheck(
49+
\ a:buffer,
50+
\ ale_linters#rst#rstcheck#GetExecutable(a:buffer),
51+
\ '%e --version',
52+
\ function('ale_linters#rst#rstcheck#GetCommand')
53+
\)
54+
endfunction
55+
2456
call ale#linter#Define('rst', {
2557
\ 'name': 'rstcheck',
2658
\ 'executable': 'rstcheck',
2759
\ 'cwd': '%s:h',
28-
\ 'command': 'rstcheck %t',
60+
\ 'command': function('ale_linters#rst#rstcheck#GetCommandWithVersionCheck'),
2961
\ 'callback': 'ale_linters#rst#rstcheck#Handle',
3062
\ 'output_stream': 'both',
3163
\})
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
Before:
2+
call ale#assert#SetUpLinterTest('rst', 'rstcheck')
3+
4+
After:
5+
call ale#assert#TearDownLinterTest()
6+
7+
Execute(The default command should include --config for rstcheck >= 3.4.0):
8+
GivenCommandOutput ['rstcheck, version 3.4.0']
9+
10+
AssertLinter 'rstcheck', [
11+
\ ale#Escape('rstcheck') . ' --version',
12+
\ ale#Escape('rstcheck')
13+
\ . ' --config '
14+
\ . ale#Escape(expand('#' . bufnr('') . ':p:h'))
15+
\ . ' %t',
16+
\]
17+
18+
Execute(The version check should be cached):
19+
GivenCommandOutput ['rstcheck, version 3.4.0']
20+
21+
AssertLinter 'rstcheck', [
22+
\ ale#Escape('rstcheck') . ' --version',
23+
\ ale#Escape('rstcheck')
24+
\ . ' --config '
25+
\ . ale#Escape(expand('#' . bufnr('') . ':p:h'))
26+
\ . ' %t',
27+
\]
28+
29+
GivenCommandOutput []
30+
31+
AssertLinter 'rstcheck', [
32+
\ ale#Escape('rstcheck')
33+
\ . ' --config '
34+
\ . ale#Escape(expand('#' . bufnr('') . ':p:h'))
35+
\ . ' %t',
36+
\]
37+
38+
Execute(The default command should not include --config for older versions):
39+
call ale#semver#ResetVersionCache()
40+
GivenCommandOutput ['rstcheck, version 3.3.0']
41+
42+
AssertLinter 'rstcheck', [
43+
\ ale#Escape('rstcheck') . ' --version',
44+
\ ale#Escape('rstcheck') . ' %t',
45+
\]
46+
47+
Execute(The command executable and options should be configurable):
48+
call ale#semver#ResetVersionCache()
49+
let b:ale_rst_rstcheck_executable = 'rstcheck2'
50+
let b:ale_rst_rstcheck_options = '--ignore-language=cpp'
51+
GivenCommandOutput ['rstcheck2, version 3.4.0']
52+
53+
AssertLinter 'rstcheck', [
54+
\ ale#Escape('rstcheck2') . ' --version',
55+
\ ale#Escape('rstcheck2')
56+
\ . ' --ignore-language=cpp'
57+
\ . ' --config '
58+
\ . ale#Escape(expand('#' . bufnr('') . ':p:h'))
59+
\ . ' %t',
60+
\]
61+
62+
Execute(The linter should run with the current buffer directory as cwd):
63+
AssertLinterCwd '%s:h'

0 commit comments

Comments
 (0)