Add commands to run ALEFix, and some tests to cover functionality so far. Add a simple autopep8 function.

This commit is contained in:
w0rp
2017-05-18 13:21:14 +01:00
parent 7d8390d43e
commit 8ebd15a54d
7 changed files with 174 additions and 17 deletions

View File

@@ -405,8 +405,7 @@ function! s:RunJob(options) abort
\ : l:command
\)
" TODO, get the exit system of the shell call and pass it on here.
call l:job_options.exit_cb(l:job_id, 0)
call l:job_options.exit_cb(l:job_id, v:shell_error)
endif
endfunction

View File

@@ -1,3 +1,6 @@
" FIXME: Switch to using the global buffer data dictionary instead.
" Cleanup will work better if there isn't a second Dictionary we have to work
" with.
let s:buffer_data = {}
let s:job_info_map = {}
@@ -23,8 +26,6 @@ function! ale#fix#ApplyQueuedFixes() abort
return
endif
echom l:data.output[0]
call setline(1, l:data.output)
let l:start_line = len(l:data.output) + 1
@@ -145,11 +146,42 @@ function! s:RunJob(options) abort
let l:job_options.out_cb = function('s:GatherOutput')
endif
let l:job_id = ale#job#Start(l:command, l:job_options)
if get(g:, 'ale_emulate_job_failure') == 1
let l:job_id = 0
elseif get(g:, 'ale_run_synchronously') == 1
" Find a unique Job value to use, which will be the same as the ID for
" running commands synchronously. This is only for test code.
let l:job_id = len(s:job_info_map) + 1
" TODO: Check that the job runs, and skip to the next item if it does not.
while has_key(s:job_info_map, l:job_id)
let l:job_id += 1
endwhile
else
let l:job_id = ale#job#Start(l:command, l:job_options)
endif
if l:job_id == 0
return 0
endif
let s:job_info_map[l:job_id] = l:job_info
if get(g:, 'ale_run_synchronously') == 1
" Run a command synchronously if this test option is set.
let l:output = systemlist(
\ type(l:command) == type([])
\ ? join(l:command[0:1]) . ' ' . ale#Escape(l:command[2])
\ : l:command
\)
if !l:read_temporary_file
let s:job_info_map[l:job_id].output = l:output
endif
call l:job_options.exit_cb(l:job_id, v:shell_error)
endif
return 1
endfunction
function! s:RunFixer(options) abort
@@ -158,7 +190,7 @@ function! s:RunFixer(options) abort
let l:index = a:options.callback_index
while len(a:options.callback_list) > l:index
let l:result = function(a:options.callback_list[l:index])(l:buffer, l:input)
let l:result = function(a:options.callback_list[l:index])(l:buffer, copy(l:input))
if type(l:result) == type(0) && l:result == 0
" When `0` is returned, skip this item.
@@ -167,9 +199,7 @@ function! s:RunFixer(options) abort
let l:input = l:result
let l:index += 1
else
" TODO: Check the return value here, and skip an index if
" the job fails.
call s:RunJob({
let l:job_ran = s:RunJob({
\ 'buffer': l:buffer,
\ 'command': l:result.command,
\ 'output_stream': get(l:result, 'output_stream', 'stdout'),
@@ -178,8 +208,13 @@ function! s:RunFixer(options) abort
\ 'callback_index': l:index,
\})
" Stop here, we will handle exit later on.
return
if !l:job_ran
" The job failed to run, so skip to the next item.
let l:index += 1
else
" Stop here, we will handle exit later on.
return
endif
endif
endwhile

View File

@@ -35,3 +35,9 @@ function! ale#handlers#python#HandlePEP8Format(buffer, lines) abort
return l:output
endfunction
function! ale#handlers#python#AutoPEP8(buffer, lines) abort
return {
\ 'command': 'autopep8 -'
\}
endfunction