marc/ale
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use the --stdin-filename option for textlint, so configuration files will be discovered better

Browse source
This commit is contained in:
w0rp 2018-03-26 10:35:10 +01:00
parent f6fc1edcdc
commit 7e4372bd1f
No known key found for this signature in database
GPG key ID: 0FC1ECAA8C81CD83
3 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
autoload/ale/handlers/textlint.vim
View file

@ -14,13 +14,11 @@ endfunction
function! ale#handlers#textlint#GetCommand(buffer) abort function! ale#handlers#textlint#GetCommand(buffer) abort
let l:executable = ale#handlers#textlint#GetExecutable(a:buffer) let l:executable = ale#handlers#textlint#GetExecutable(a:buffer)
let l:config = ale#path#FindNearestFile(a:buffer, '.textlintrc')
let l:options = ale#Var(a:buffer, 'textlint_options') let l:options = ale#Var(a:buffer, 'textlint_options')
return ale#node#Executable(a:buffer, l:executable) return ale#node#Executable(a:buffer, l:executable)
\ . (!empty(l:options) ? ' ' . l:options : '') \ . (!empty(l:options) ? ' ' . l:options : '')
\ . (!empty(l:config) ? ' -c ' . ale#Escape(l:config) : '') \ . ' -f json --stdin --stdin-filename %s'
\ . ' -f json %t'
endfunction endfunction
function! ale#handlers#textlint#HandleTextlintOutput(buffer, lines) abort function! ale#handlers#textlint#HandleTextlintOutput(buffer, lines) abort

24
test/command_callback/test_textlint_command_callbacks.vader
View file

@ -36,13 +36,13 @@ Execute(The executable should be configurable):
Execute(The executable should be used in the command): Execute(The executable should be used in the command):
AssertEqual AssertEqual
\ ale#Escape('textlint') . ' -f json %t', \ ale#Escape('textlint') . ' -f json --stdin --stdin-filename %s',
\ ale#handlers#textlint#GetCommand(bufnr('')) \ ale#handlers#textlint#GetCommand(bufnr(''))
let b:ale_textlint_executable = 'foobar' let b:ale_textlint_executable = 'foobar'
AssertEqual AssertEqual
\ ale#Escape('foobar') . ' -f json %t', \ ale#Escape('foobar') . ' -f json --stdin --stdin-filename %s',
\ ale#handlers#textlint#GetCommand(bufnr('')) \ ale#handlers#textlint#GetCommand(bufnr(''))
\ \
@ -50,7 +50,7 @@ Execute(The options should be configurable):
let b:ale_textlint_options = '--something' let b:ale_textlint_options = '--something'
AssertEqual AssertEqual
\ ale#Escape('textlint') . ' --something -f json %t', \ ale#Escape('textlint') . ' --something -f json --stdin --stdin-filename %s',
\ ale#handlers#textlint#GetCommand(bufnr('')) \ ale#handlers#textlint#GetCommand(bufnr(''))
Execute(The local executable from .bin should be used if available): Execute(The local executable from .bin should be used if available):
@ -61,7 +61,8 @@ Execute(The local executable from .bin should be used if available):
\ ale#handlers#textlint#GetExecutable(bufnr('')) \ ale#handlers#textlint#GetExecutable(bufnr(''))
AssertEqual AssertEqual
\ ale#Escape(g:dir . '/textlint_paths/with_bin_path/node_modules/.bin/textlint') . ' -f json %t', \ ale#Escape(ale#path#Simplify(g:dir . '/textlint_paths/with_bin_path/node_modules/.bin/textlint'))
\ . ' -f json --stdin --stdin-filename %s',
\ ale#handlers#textlint#GetCommand(bufnr('')) \ ale#handlers#textlint#GetCommand(bufnr(''))
Execute(The local executable from textlint/bin should be used if available): Execute(The local executable from textlint/bin should be used if available):
@ -73,19 +74,12 @@ Execute(The local executable from textlint/bin should be used if available):
if has('win32') if has('win32')
AssertEqual AssertEqual
\ ale#Escape('node.exe') . ' ' . ale#Escape(g:dir . '/textlint_paths/with_textlint_bin_path/node_modules/textlint/bin/textlint.js') . ' -f json %t', \ ale#Escape('node.exe') . ' ' . ale#Escape(ale#path#Simplify(g:dir . '/textlint_paths/with_textlint_bin_path/node_modules/textlint/bin/textlint.js'))
\ . ' -f json --stdin --stdin-filename %s',
\ ale#handlers#textlint#GetCommand(bufnr('')) \ ale#handlers#textlint#GetCommand(bufnr(''))
else else
AssertEqual AssertEqual
\ ale#Escape(g:dir . '/textlint_paths/with_textlint_bin_path/node_modules/textlint/bin/textlint.js') . ' -f json %t', \ ale#Escape(ale#path#Simplify(g:dir . '/textlint_paths/with_textlint_bin_path/node_modules/textlint/bin/textlint.js'))
\ . ' -f json --stdin --stdin-filename %s',
\ ale#handlers#textlint#GetCommand(bufnr('')) \ ale#handlers#textlint#GetCommand(bufnr(''))
endif endif
Execute(Configuration files should be discovered):
call ale#test#SetFilename('textlint_paths/with_config_path/foo.txt')
AssertEqual
\ ale#Escape('textlint')
\ . ' -c ' . ale#Escape(g:dir . '/textlint_paths/with_config_path/.textlintrc')
\ . ' -f json %t',
\ ale#handlers#textlint#GetCommand(bufnr(''))

0
test/command_callback/textlint_paths/with_config_path/.textlintrc
View file