Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion ale_linters/toml/tombi.vim
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,19 @@

call ale#Set('toml_tombi_executable', 'tombi')
call ale#Set('toml_tombi_lsp_options', '')
call ale#Set('toml_tombi_online', 0)

function! ale_linters#toml#tombi#GetCommand(buffer) abort
let l:offline = ''

if !ale#Var(a:buffer, 'toml_tombi_online')
let l:offline = '--offline'
endif

return '%e lsp'
\ . ale#Pad(l:offline)
\ . ale#Pad(ale#Var(a:buffer, 'toml_tombi_lsp_options'))
endfunction

function! ale_linters#toml#tombi#GetProjectRoot(buffer) abort
" Try to find nearest tombi.toml
Expand Down Expand Up @@ -33,6 +46,6 @@ call ale#linter#Define('toml', {
\ 'name': 'tombi',
\ 'lsp': 'stdio',
\ 'executable': {b -> ale#Var(b, 'toml_tombi_executable')},
\ 'command': {b -> '%e lsp' . ale#Pad(ale#Var(b, 'toml_tombi_lsp_options'))},
\ 'command': function('ale_linters#toml#tombi#GetCommand'),
\ 'project_root': function('ale_linters#toml#tombi#GetProjectRoot'),
\})
7 changes: 7 additions & 0 deletions autoload/ale/fixers/tombi_format.vim
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,20 @@

call ale#Set('toml_tombi_executable', 'tombi')
call ale#Set('toml_tombi_format_options', '')
call ale#Set('toml_tombi_online', 0)

function! ale#fixers#tombi_format#Fix(buffer) abort
let l:executable = ale#Var(a:buffer, 'toml_tombi_executable')
let l:offline = ''

if !ale#Var(a:buffer, 'toml_tombi_online')
let l:offline = '--offline'
endif

return {
\ 'command': ale#Escape(l:executable)
\ . ' format'
\ . ale#Pad(l:offline)
\ . ale#Pad(ale#Var(a:buffer, 'toml_tombi_format_options')),
\}
endfunction
7 changes: 7 additions & 0 deletions autoload/ale/fixers/tombi_lint.vim
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,20 @@

call ale#Set('toml_tombi_executable', 'tombi')
call ale#Set('toml_tombi_lint_options', '')
call ale#Set('toml_tombi_online', 0)

function! ale#fixers#tombi_lint#Fix(buffer) abort
let l:executable = ale#Var(a:buffer, 'toml_tombi_executable')
let l:offline = ''

if !ale#Var(a:buffer, 'toml_tombi_online')
let l:offline = '--offline'
endif

return {
\ 'command': ale#Escape(l:executable)
\ . ' lint'
\ . ale#Pad(l:offline)
\ . ale#Pad(ale#Var(a:buffer, 'toml_tombi_lint_options')),
\}
endfunction
12 changes: 12 additions & 0 deletions doc/ale-toml.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,18 @@ g:ale_toml_tombi_executable
`tombi`.


*ale-options.toml_tombi_online*
*g:ale_toml_tombi_online*
*b:ale_toml_tombi_online*
toml_tombi_online
g:ale_toml_tombi_online
Type: |Boolean|
Default: `1`

This variable can be modified allow fetching remote schemas when using
`tombi`.


*ale-options.toml_tombi_lsp_options*
*g:ale_toml_tombi_lsp_options*
*b:ale_toml_tombi_lsp_options*
Expand Down
14 changes: 11 additions & 3 deletions test/fixers/test_tombi_format_fixer_callback.vader
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Before:
Save g:ale_toml_tombi_executable
Save g:ale_toml_tombi_format_options
Save g:ale_toml_tombi_online

" Use an invalid global executable, so we don't match it.
let g:ale_toml_tombi_executable = 'xxxinvalid'
Expand All @@ -15,12 +16,19 @@ After:

Execute(The tombi format callback should return the correct default values):
AssertEqual
\ {'command': ale#Escape('xxxinvalid') . ' format'},
\ {'command': ale#Escape('xxxinvalid') . ' format --offline'},
\ ale#fixers#tombi_format#Fix(bufnr(''))

Execute(The tombi format callback should obey `toml_tombi_online`):
let g:ale_toml_tombi_online = 1

AssertEqual
\ {'command': ale#Escape('xxxinvalid') . ' lint'},
\ ale#fixers#tombi_lint#Fix(bufnr(''))

Execute(The tombi format callback should include custom options):
let g:ale_toml_tombi_format_options = "--offline"
let g:ale_toml_tombi_format_options = "--no-cache"

AssertEqual
\ {'command': ale#Escape('xxxinvalid') . ' format --offline'},
\ {'command': ale#Escape('xxxinvalid') . ' format --offline --no-cache'},
\ ale#fixers#tombi_format#Fix(bufnr(''))
12 changes: 10 additions & 2 deletions test/fixers/test_tombi_lint_fixer_callback.vader
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Before:
Save g:ale_toml_tombi_executable
Save g:ale_toml_tombi_lint_options
Save g:ale_toml_tombi_online

" Use an invalid global executable, so we don't match it.
let g:ale_toml_tombi_executable = 'xxxinvalid'
Expand All @@ -14,13 +15,20 @@ After:
call ale#test#RestoreDirectory()

Execute(The tombi lint callback should return the correct default values):
AssertEqual
\ {'command': ale#Escape('xxxinvalid') . ' lint --offline'},
\ ale#fixers#tombi_lint#Fix(bufnr(''))

Execute(The tombi lint callback should obey `toml_tombi_online`):
let g:ale_toml_tombi_online = 1

AssertEqual
\ {'command': ale#Escape('xxxinvalid') . ' lint'},
\ ale#fixers#tombi_lint#Fix(bufnr(''))

Execute(The tombi lint callback should include custom options):
let g:ale_toml_tombi_lint_options = "--offline"
let g:ale_toml_tombi_lint_options = "--no-cache"

AssertEqual
\ {'command': ale#Escape('xxxinvalid') . ' lint --offline'},
\ {'command': ale#Escape('xxxinvalid') . ' lint --offline --no-cache'},
\ ale#fixers#tombi_lint#Fix(bufnr(''))
6 changes: 6 additions & 0 deletions test/linter/test_toml_tombi.vader
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
Before:
Save g:ale_toml_tombi_online
call ale#assert#SetUpLinterTest('toml', 'tombi')

After:
call ale#assert#TearDownLinterTest()

Execute(The default executable path should be correct):
AssertLinter 'tombi', ale#Escape('tombi') . ' lsp --offline'

Execute(The default executable path should obey `toml_tombi_online`):
let g:ale_toml_tombi_online = 1

AssertLinter 'tombi', ale#Escape('tombi') . ' lsp'

Execute(The project root should be detected correctly with a configuration file):
Expand Down