From ca83f11bee092dda6dc2ee3df8bc07060b59120f Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Wed, 19 Jul 2017 14:50:33 -0600 Subject: [PATCH 1/2] added fixer for Standard --- autoload/ale/fix/registry.vim | 5 +++++ autoload/ale/fixers/standard.vim | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 autoload/ale/fixers/standard.vim diff --git a/autoload/ale/fix/registry.vim b/autoload/ale/fix/registry.vim index 191a827f..6568a477 100644 --- a/autoload/ale/fix/registry.vim +++ b/autoload/ale/fix/registry.vim @@ -62,6 +62,11 @@ let s:default_registry = { \ 'suggested_filetypes': ['ruby'], \ 'description': 'Fix ruby files with rubocop --auto-correct.', \ }, +\ 'standard': { +\ 'function': 'ale#fixers#standard#Fix', +\ 'suggested_filetypes': ['javascript'], +\ 'description': 'Fix JavaScript files using standard --fix', +\ }, \} " Reset the function registry to the default entries. diff --git a/autoload/ale/fixers/standard.vim b/autoload/ale/fixers/standard.vim new file mode 100644 index 00000000..bb457f30 --- /dev/null +++ b/autoload/ale/fixers/standard.vim @@ -0,0 +1,19 @@ +" Author: Sumner Evans +" Description: Fixing files with Standard. + +function! ale#fixers#standard#GetExecutable(buffer) abort + return ale#node#FindExecutable(a:buffer, 'javascript_standard', [ + \ 'node_modules/standard/bin/cmd.js', + \ 'node_modules/.bin/standard', + \]) +endfunction + +function! ale#fixers#standard#Fix(buffer) abort + let l:executable = ale#fixers#standard#GetExecutable(a:buffer) + + return { + \ 'command': ale#Escape(l:executable) + \ . ' --fix %t', + \ 'read_temporary_file': 1, + \} +endfunction From f3fec6685ee6831d1202d7f21075ad159de6a9eb Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Thu, 20 Jul 2017 19:25:28 -0600 Subject: [PATCH 2/2] added tests for Standard.js --- autoload/ale/fixers/standard.vim | 10 +++++- .../node_modules/standard/bin/cmd.js | 0 .../fixers/test_standard_fixer_callback.vader | 32 +++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 test/eslint-test-files/react-app/node_modules/standard/bin/cmd.js create mode 100644 test/fixers/test_standard_fixer_callback.vader diff --git a/autoload/ale/fixers/standard.vim b/autoload/ale/fixers/standard.vim index bb457f30..6a0c6b65 100644 --- a/autoload/ale/fixers/standard.vim +++ b/autoload/ale/fixers/standard.vim @@ -11,8 +11,16 @@ endfunction function! ale#fixers#standard#Fix(buffer) abort let l:executable = ale#fixers#standard#GetExecutable(a:buffer) + if ale#Has('win32') && l:executable =~? 'cmd\.js$' + " For Windows, if we detect an standard.js script, we need to execute + " it with node, or the file can be opened with a text editor. + let l:head = 'node ' . ale#Escape(l:executable) + else + let l:head = ale#Escape(l:executable) + endif + return { - \ 'command': ale#Escape(l:executable) + \ 'command': l:head \ . ' --fix %t', \ 'read_temporary_file': 1, \} diff --git a/test/eslint-test-files/react-app/node_modules/standard/bin/cmd.js b/test/eslint-test-files/react-app/node_modules/standard/bin/cmd.js new file mode 100644 index 00000000..e69de29b diff --git a/test/fixers/test_standard_fixer_callback.vader b/test/fixers/test_standard_fixer_callback.vader new file mode 100644 index 00000000..934b07b8 --- /dev/null +++ b/test/fixers/test_standard_fixer_callback.vader @@ -0,0 +1,32 @@ +Before: + call ale#test#SetDirectory('/testplugin/test/fixers') + +After: + let g:ale_has_override = {} + call ale#test#RestoreDirectory() + +Execute(The path to standard.js should be run on Unix): + call ale#test#SetFilename('../eslint-test-files/react-app/subdir/testfile.js') + + AssertEqual + \ { + \ 'read_temporary_file': 1, + \ 'command': + \ ale#Escape(simplify(g:dir . '/../eslint-test-files/react-app/node_modules/standard/bin/cmd.js')) + \ . ' --fix %t', + \ }, + \ ale#fixers#standard#Fix(bufnr('')) + +Execute(The standard fixer with standard.js should be run with node on Windows): + call ale#test#SetFilename('../eslint-test-files/react-app/subdir/testfile.js') + let g:ale_has_override['win32'] = 1 + + " We have to execute the file with node. + AssertEqual + \ { + \ 'read_temporary_file': 1, + \ 'command': 'node ' + \ . ale#Escape(simplify(g:dir . '/../eslint-test-files/react-app/node_modules/standard/bin/cmd.js')) + \ . ' --fix %t', + \ }, + \ ale#fixers#standard#Fix(bufnr(''))