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

fixers/xo: remove unnecessary directory crawl

Browse source
This commit is contained in:
Charles B Johnson 2020-07-04 14:12:14 -05:00
parent 1991313ee7
commit 23ff19a162
No known key found for this signature in database
GPG key ID: 390184033B3454E3
4 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
autoload/ale/fixers/xo.vim
View file

@ -28,11 +28,8 @@ function! ale#fixers#xo#ApplyFixForVersion(buffer, version, executable, options)
" 0.30.0 is the first version with a working --stdin --fix " 0.30.0 is the first version with a working --stdin --fix
if ale#semver#GTE(a:version, [0, 30, 0]) if ale#semver#GTE(a:version, [0, 30, 0])
let l:project_root = ale#handlers#xo#GetProjectRoot(a:buffer)
return { return {
\ 'command': ale#path#CdString(l:project_root) \ 'command': l:executable
\ . l:executable
\ . ' --stdin --stdin-filename %s' \ . ' --stdin --stdin-filename %s'
\ . ' --fix' \ . ' --fix'
\ . l:options, \ . l:options,

6
autoload/ale/handlers/xo.vim
View file

@ -27,9 +27,3 @@ endfunction
function! ale#handlers#xo#HandleJSON(buffer, lines) abort function! ale#handlers#xo#HandleJSON(buffer, lines) abort
return ale#handlers#eslint#HandleJSON(a:buffer, a:lines) return ale#handlers#eslint#HandleJSON(a:buffer, a:lines)
endfunction endfunction
function! ale#handlers#xo#GetProjectRoot(buffer) abort
let l:modules_dir = ale#path#FindNearestDirectory(a:buffer, 'node_modules')
return empty(l:modules_dir) ? '' : fnamemodify(l:modules_dir, ':h:h')
endfunction

3
test/fixers/test_xo_fixer_callback.vader
View file

@ -37,8 +37,7 @@ Execute(--stdin should be used when xo is new enough):
GivenCommandOutput ['0.30.0'] GivenCommandOutput ['0.30.0']
AssertFixer AssertFixer
\ { \ {
\ 'command': ale#path#CdString(ale#path#Simplify(g:dir . '/../xo-test-files/monorepo')) \ 'command': (has('win32') ? 'node.exe ' : '')
\ . (has('win32') ? 'node.exe ' : '')
\ . ale#Escape(ale#path#Simplify(g:dir . '/../xo-test-files/monorepo/node_modules/xo/cli.js')) \ . ale#Escape(ale#path#Simplify(g:dir . '/../xo-test-files/monorepo/node_modules/xo/cli.js'))
\ . ' --stdin --stdin-filename %s' \ . ' --stdin --stdin-filename %s'
\ . ' --fix' \ . ' --fix'

3
test/fixers/test_xots_fixer_callback.vader
View file

@ -37,8 +37,7 @@ Execute(--stdin should be used when xo is new enough):
GivenCommandOutput ['0.30.0'] GivenCommandOutput ['0.30.0']
AssertFixer AssertFixer
\ { \ {
\ 'command': ale#path#CdString(ale#path#Simplify(g:dir . '/../xo-test-files/monorepo')) \ 'command': (has('win32') ? 'node.exe ' : '')
\ . (has('win32') ? 'node.exe ' : '')
\ . ale#Escape(ale#path#Simplify(g:dir . '/../xo-test-files/monorepo/node_modules/xo/cli.js')) \ . ale#Escape(ale#path#Simplify(g:dir . '/../xo-test-files/monorepo/node_modules/xo/cli.js'))
\ . ' --stdin --stdin-filename %s' \ . ' --stdin --stdin-filename %s'
\ . ' --fix' \ . ' --fix'