summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ale_linters/javascript/eslint.vim2
-rw-r--r--autoload/ale/handlers/eslint.vim17
-rw-r--r--test/command_callback/test_javascript_eslint_command_callback.vader9
-rw-r--r--test/command_callback/test_typescript_eslint_command_callback.vader9
-rw-r--r--test/test_eslint_executable_detection.vader3
5 files changed, 7 insertions, 33 deletions
diff --git a/ale_linters/javascript/eslint.vim b/ale_linters/javascript/eslint.vim
index 5be2377b..23e16949 100644
--- a/ale_linters/javascript/eslint.vim
+++ b/ale_linters/javascript/eslint.vim
@@ -1,8 +1,6 @@
" Author: w0rp <devw0rp@gmail.com>
" Description: eslint for JavaScript files
-call ale#handlers#eslint#InitVariables()
-
call ale#linter#Define('javascript', {
\ 'name': 'eslint',
\ 'output_stream': 'both',
diff --git a/autoload/ale/handlers/eslint.vim b/autoload/ale/handlers/eslint.vim
index 9f4f9357..bc10ec21 100644
--- a/autoload/ale/handlers/eslint.vim
+++ b/autoload/ale/handlers/eslint.vim
@@ -3,15 +3,11 @@
let s:sep = has('win32') ? '\' : '/'
-function! ale#handlers#eslint#InitVariables() abort
- call ale#Set('javascript_eslint_options', '')
- 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_suppress_eslintignore', 0)
- call ale#Set('javascript_eslint_suppress_missing_config', 0)
-endfunction
-
-call ale#handlers#eslint#InitVariables()
+call ale#Set('javascript_eslint_options', '')
+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_suppress_eslintignore', 0)
+call ale#Set('javascript_eslint_suppress_missing_config', 0)
function! ale#handlers#eslint#FindConfig(buffer) abort
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')
- return ale#path#BufferCdString(a:buffer)
- \ . ale#node#Executable(a:buffer, l:executable)
+ return ale#node#Executable(a:buffer, l:executable)
\ . (!empty(l:options) ? ' ' . l:options : '')
\ . ' -f unix --stdin --stdin-filename %s'
endfunction
diff --git a/test/command_callback/test_javascript_eslint_command_callback.vader b/test/command_callback/test_javascript_eslint_command_callback.vader
deleted file mode 100644
index 9ac8893e..00000000
--- a/test/command_callback/test_javascript_eslint_command_callback.vader
+++ /dev/null
@@ -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'
diff --git a/test/command_callback/test_typescript_eslint_command_callback.vader b/test/command_callback/test_typescript_eslint_command_callback.vader
deleted file mode 100644
index 7a52a75b..00000000
--- a/test/command_callback/test_typescript_eslint_command_callback.vader
+++ /dev/null
@@ -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'
diff --git a/test/test_eslint_executable_detection.vader b/test/test_eslint_executable_detection.vader
index 7b0329ea..c1438ed8 100644
--- a/test/test_eslint_executable_detection.vader
+++ b/test/test_eslint_executable_detection.vader
@@ -58,8 +58,7 @@ Execute(eslint.js executables should be run with node on Windows):
" We have to execute the file with node.
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'))
\ . ' -f unix --stdin --stdin-filename %s',
\ ale#handlers#eslint#GetCommand(bufnr(''))