Revert "#1459 Always run ESLint in the directory of the file being checked"
This reverts commit 634bf73f52
.
This commit is contained in:
parent
634bf73f52
commit
e9086dd55c
@ -1,8 +1,6 @@
|
|||||||
" Author: w0rp <devw0rp@gmail.com>
|
" Author: w0rp <devw0rp@gmail.com>
|
||||||
" Description: eslint for JavaScript files
|
" Description: eslint for JavaScript files
|
||||||
|
|
||||||
call ale#handlers#eslint#InitVariables()
|
|
||||||
|
|
||||||
call ale#linter#Define('javascript', {
|
call ale#linter#Define('javascript', {
|
||||||
\ 'name': 'eslint',
|
\ 'name': 'eslint',
|
||||||
\ 'output_stream': 'both',
|
\ 'output_stream': 'both',
|
||||||
|
@ -3,15 +3,11 @@
|
|||||||
|
|
||||||
let s:sep = has('win32') ? '\' : '/'
|
let s:sep = has('win32') ? '\' : '/'
|
||||||
|
|
||||||
function! ale#handlers#eslint#InitVariables() abort
|
|
||||||
call ale#Set('javascript_eslint_options', '')
|
call ale#Set('javascript_eslint_options', '')
|
||||||
call ale#Set('javascript_eslint_executable', 'eslint')
|
call ale#Set('javascript_eslint_executable', 'eslint')
|
||||||
call ale#Set('javascript_eslint_use_global', get(g:, 'ale_use_global_executables', 0))
|
call ale#Set('javascript_eslint_use_global', get(g:, 'ale_use_global_executables', 0))
|
||||||
call ale#Set('javascript_eslint_suppress_eslintignore', 0)
|
call ale#Set('javascript_eslint_suppress_eslintignore', 0)
|
||||||
call ale#Set('javascript_eslint_suppress_missing_config', 0)
|
call ale#Set('javascript_eslint_suppress_missing_config', 0)
|
||||||
endfunction
|
|
||||||
|
|
||||||
call ale#handlers#eslint#InitVariables()
|
|
||||||
|
|
||||||
function! ale#handlers#eslint#FindConfig(buffer) abort
|
function! ale#handlers#eslint#FindConfig(buffer) abort
|
||||||
for l:path in ale#path#Upwards(expand('#' . a:buffer . ':p:h'))
|
for l:path in ale#path#Upwards(expand('#' . a:buffer . ':p:h'))
|
||||||
@ -46,8 +42,7 @@ function! ale#handlers#eslint#GetCommand(buffer) abort
|
|||||||
|
|
||||||
let l:options = ale#Var(a:buffer, 'javascript_eslint_options')
|
let l:options = ale#Var(a:buffer, 'javascript_eslint_options')
|
||||||
|
|
||||||
return ale#path#BufferCdString(a:buffer)
|
return ale#node#Executable(a:buffer, l:executable)
|
||||||
\ . ale#node#Executable(a:buffer, l:executable)
|
|
||||||
\ . (!empty(l:options) ? ' ' . l:options : '')
|
\ . (!empty(l:options) ? ' ' . l:options : '')
|
||||||
\ . ' -f unix --stdin --stdin-filename %s'
|
\ . ' -f unix --stdin --stdin-filename %s'
|
||||||
endfunction
|
endfunction
|
||||||
|
@ -1,9 +0,0 @@
|
|||||||
Before:
|
|
||||||
call ale#assert#SetUpLinterTest('javascript', 'eslint')
|
|
||||||
|
|
||||||
After:
|
|
||||||
call ale#assert#TearDownLinterTest()
|
|
||||||
|
|
||||||
Execute(The default command should be correct):
|
|
||||||
AssertLinter 'eslint', 'cd ' . ale#Escape(g:dir) . ' && '
|
|
||||||
\ . ale#Escape('eslint') . ' -f unix --stdin --stdin-filename %s'
|
|
@ -1,9 +0,0 @@
|
|||||||
Before:
|
|
||||||
call ale#assert#SetUpLinterTest('typescript', 'eslint')
|
|
||||||
|
|
||||||
After:
|
|
||||||
call ale#assert#TearDownLinterTest()
|
|
||||||
|
|
||||||
Execute(The default command should be correct):
|
|
||||||
AssertLinter 'eslint', 'cd ' . ale#Escape(g:dir) . ' && '
|
|
||||||
\ . ale#Escape('eslint') . ' -f unix --stdin --stdin-filename %s'
|
|
@ -58,8 +58,7 @@ Execute(eslint.js executables should be run with node on Windows):
|
|||||||
|
|
||||||
" We have to execute the file with node.
|
" We have to execute the file with node.
|
||||||
AssertEqual
|
AssertEqual
|
||||||
\ 'cd ' . ale#Escape(ale#path#Simplify(g:dir . '/eslint-test-files/react-app/subdir')) . ' && '
|
\ ale#Escape('node.exe') . ' '
|
||||||
\ . ale#Escape('node.exe') . ' '
|
|
||||||
\ . ale#Escape(ale#path#Simplify(g:dir . '/eslint-test-files/react-app/node_modules/eslint/bin/eslint.js'))
|
\ . ale#Escape(ale#path#Simplify(g:dir . '/eslint-test-files/react-app/node_modules/eslint/bin/eslint.js'))
|
||||||
\ . ' -f unix --stdin --stdin-filename %s',
|
\ . ' -f unix --stdin --stdin-filename %s',
|
||||||
\ ale#handlers#eslint#GetCommand(bufnr(''))
|
\ ale#handlers#eslint#GetCommand(bufnr(''))
|
||||||
|
Loading…
Reference in New Issue
Block a user