RepoMirrors
/
ale
mirror of https://github.com/dense-analysis/ale
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2053 from andreypopp/fix-ocamlformat-stdin-stdout 

Make ocamlformat work without temporary files
This commit is contained in:
w0rp 2018-11-10 10:57:11 +00:00 committed by GitHub
parent f8d3ffb60e b9fb62a4cd
commit 90f2875f29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
autoload/ale/fixers/ocamlformat.vim
View File

@ -5,14 +5,14 @@ call ale#Set('ocaml_ocamlformat_executable', 'ocamlformat')
call ale#Set('ocaml_ocamlformat_options', '')
function! ale#fixers#ocamlformat#Fix(buffer) abort
let l:filename = expand('#' . a:buffer . ':p')
let l:executable = ale#Var(a:buffer, 'ocaml_ocamlformat_executable')
let l:options = ale#Var(a:buffer, 'ocaml_ocamlformat_options')
return {
\ 'command': ale#Escape(l:executable)
\ . (empty(l:options) ? '' : ' ' . l:options)
\ . ' --inplace'
\ . ' %t',
\ 'read_temporary_file': 1,
\ . ' --name=' . ale#Escape(l:filename)
\ . ' -'
\}
endfunction

10
test/fixers/test_ocamlformat_fixer_callback.vader
View File

@ -18,10 +18,9 @@ Execute(The ocamlformat callback should return the correct default values):
AssertEqual
\ {
\ 'read_temporary_file': 1,
\ 'command': ale#Escape('xxxinvalid')
\ . ' --inplace'
\ . ' %t',
\ . ' --name=' . ale#Escape(bufname(bufnr('')))
\ . ' -',
\ },
\ ale#fixers#ocamlformat#Fix(bufnr(''))
@ -31,10 +30,9 @@ Execute(The ocamlformat callback should include custom ocamlformat options):
AssertEqual
\ {
\ 'read_temporary_file': 1,
\ 'command': ale#Escape('xxxinvalid')
\ . ' ' . g:ale_ocaml_ocamlformat_options
\ . ' --inplace'
\ . ' %t',
\ . ' --name=' . ale#Escape(bufname(bufnr('')))
\ . ' -',
\ },
\ ale#fixers#ocamlformat#Fix(bufnr(''))