Clean up embertemplatelint code

Alias ember-template-lint to embertemplatelint so users can use either
string to enable the linter.
This commit is contained in:
w0rp 2020-09-05 19:06:07 +01:00
parent 844febb9fb
commit 152b2cb691
No known key found for this signature in database
GPG key ID: 0FC1ECAA8C81CD83
4 changed files with 28 additions and 30 deletions

View file

@ -19,11 +19,11 @@ endfunction
function! ale_linters#handlebars#embertemplatelint#GetCommandWithVersionCheck(buffer) abort function! ale_linters#handlebars#embertemplatelint#GetCommandWithVersionCheck(buffer) abort
return ale#semver#RunWithVersionCheck( return ale#semver#RunWithVersionCheck(
\ a:buffer, \ a:buffer,
\ ale_linters#handlebars#embertemplatelint#GetExecutable(a:buffer), \ ale_linters#handlebars#embertemplatelint#GetExecutable(a:buffer),
\ '%e --version', \ '%e --version',
\ function('ale_linters#handlebars#embertemplatelint#GetCommand'), \ function('ale_linters#handlebars#embertemplatelint#GetCommand'),
\ ) \)
endfunction endfunction
function! ale_linters#handlebars#embertemplatelint#Handle(buffer, lines) abort function! ale_linters#handlebars#embertemplatelint#Handle(buffer, lines) abort
@ -52,7 +52,8 @@ function! ale_linters#handlebars#embertemplatelint#Handle(buffer, lines) abort
endfunction endfunction
call ale#linter#Define('handlebars', { call ale#linter#Define('handlebars', {
\ 'name': 'ember-template-lint', \ 'name': 'embertemplatelint',
\ 'aliases': ['ember-template-lint'],
\ 'executable': function('ale_linters#handlebars#embertemplatelint#GetExecutable'), \ 'executable': function('ale_linters#handlebars#embertemplatelint#GetExecutable'),
\ 'command': function('ale_linters#handlebars#embertemplatelint#GetCommandWithVersionCheck'), \ 'command': function('ale_linters#handlebars#embertemplatelint#GetCommandWithVersionCheck'),
\ 'callback': 'ale_linters#handlebars#embertemplatelint#Handle', \ 'callback': 'ale_linters#handlebars#embertemplatelint#Handle',

View file

@ -14,7 +14,8 @@ ember-template-lint *ale-handlebars-embertemplatelint*
g:ale_handlebars_embertemplatelint_executable g:ale_handlebars_embertemplatelint_executable
*g:ale_handlebars_embertemplatelint_executable* *g:ale_handlebars_embertemplatelint_executable*
Type: |String| *b:ale_handlebars_embertemplatelint_executable* *b:ale_handlebars_embertemplatelint_executable*
Type: |String|
Default: `'ember-template-lint'` Default: `'ember-template-lint'`
See |ale-integrations-local-executables| See |ale-integrations-local-executables|
@ -22,7 +23,8 @@ g:ale_handlebars_embertemplatelint_executable
g:ale_handlebars_embertemplatelint_use_global g:ale_handlebars_embertemplatelint_use_global
*g:ale_handlebars_embertemplatelint_use_global* *g:ale_handlebars_embertemplatelint_use_global*
Type: |Number| *b:ale_handlebars_embertemplatelint_use_global* *b:ale_handlebars_embertemplatelint_use_global*
Type: |Number|
Default: `get(g:, 'ale_use_global_executables', 0)` Default: `get(g:, 'ale_use_global_executables', 0)`
See |ale-integrations-local-executables| See |ale-integrations-local-executables|

View file

@ -0,0 +1,17 @@
Before:
call ale#assert#SetUpLinterTest('handlebars', 'embertemplatelint')
GivenCommandOutput ['1.6.0']
After:
call ale#assert#TearDownLinterTest()
Execute(ember-template-lint executables runs the right command):
AssertLinter 'ember-template-lint',
\ ale#Escape('ember-template-lint') . ' --json --filename %s'
Execute(old ember-template-lint executables runs the right command):
GivenCommandOutput []
AssertLinter 'ember-template-lint',
\ ale#Escape('ember-template-lint') . ' --json %t'

View file

@ -1,22 +0,0 @@
Before:
call ale#test#SetDirectory('/testplugin/test')
runtime ale_linters/handlebars/embertemplatelint.vim
After:
call ale#test#RestoreDirectory()
call ale#linter#Reset()
Execute(ember-template-lint executables runs the right command):
call ale#test#SetFilename('ember-template-lint-test-files/app/template.hbs')
AssertEqual
\ ale_linters#handlebars#embertemplatelint#GetCommand(bufnr(''), [2, 0, 0]),
\ '%e --json --filename %s'
Execute(old ember-template-lint executables runs the right command):
call ale#test#SetFilename('ember-template-lint-test-files/app/template.hbs')
AssertEqual
\ ale_linters#handlebars#embertemplatelint#GetCommand(bufnr(''), [1, 5, 0]),
\ '%e --json %t'