Close #3325 - Apply new formatting where possible

30 files changed, 71 insertions, 96 deletions

diff --git a/.gitignore b/.gitignore
index ae9f65fb..7711fb99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,12 @@
 !.editorconfig
 *.obj
+*.pyc
 # Ignore all hidden files everywhere.
 # Use `git add -f` to add hidden files.
 .*
-__pycache__
-*.pyc
 /doc/tags
 /init.vim
 /test/ale-info-test-file
+/vader_output
+__pycache__
 tags
diff --git a/ale_linters/ada/gcc.vim b/ale_linters/ada/gcc.vim
index 87496b81..5afc9ae3 100644
--- a/ale_linters/ada/gcc.vim
+++ b/ale_linters/ada/gcc.vim
@@ -18,7 +18,7 @@ function! ale_linters#ada#gcc#GetCommand(buffer) abort
     " -gnatc: Check syntax and semantics only (no code generation attempted)
     return '%e -x ada -c -gnatc'
     \   . ' -o ' . ale#Escape(l:out_file)
-    \   . ' -I ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h'))
+    \   . ' -I %s:h'
     \   . ale#Pad(ale#Var(a:buffer, 'ada_gcc_options'))
     \   . ' %t'
 endfunction
diff --git a/ale_linters/asm/gcc.vim b/ale_linters/asm/gcc.vim
index eecab6ef..cda38923 100644
--- a/ale_linters/asm/gcc.vim
+++ b/ale_linters/asm/gcc.vim
@@ -9,7 +9,7 @@ function! ale_linters#asm#gcc#GetCommand(buffer) abort
     " -fsyntax-only doesn't catch everything.
     return '%e -x assembler'
     \   . ' -o ' . g:ale#util#nul_file
-    \   . '-iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h'))
+    \   . '-iquote %s:h'
     \   . ' ' . ale#Var(a:buffer, 'asm_gcc_options') . ' -'
 endfunction
 
diff --git a/ale_linters/c/cc.vim b/ale_linters/c/cc.vim
index 6d920ab0..5655fbf7 100644
--- a/ale_linters/c/cc.vim
+++ b/ale_linters/c/cc.vim
@@ -38,7 +38,7 @@ function! ale_linters#c#cc#GetCommand(buffer, output) abort
     " -fsyntax-only doesn't catch everything.
     return '%e -S -x c'
     \   . ' -o ' . g:ale#util#nul_file
-    \   . ' -iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h'))
+    \   . ' -iquote %s:h'
     \   . ale#Pad(l:cflags)
     \   . ale#Pad(l:ale_flags) . ' -'
 endfunction
diff --git a/ale_linters/cpp/cc.vim b/ale_linters/cpp/cc.vim
index eed3898f..ffb8f068 100644
--- a/ale_linters/cpp/cc.vim
+++ b/ale_linters/cpp/cc.vim
@@ -38,7 +38,7 @@ function! ale_linters#cpp#cc#GetCommand(buffer, output) abort
     " -fsyntax-only doesn't catch everything.
     return '%e -S -x c++'
     \   . ' -o ' . g:ale#util#nul_file
-    \   . ' -iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h'))
+    \   . ' -iquote %s:h'
     \   . ale#Pad(l:cflags)
     \   . ale#Pad(l:ale_flags) . ' -'
 endfunction
diff --git a/ale_linters/cuda/nvcc.vim b/ale_linters/cuda/nvcc.vim
index f3af07b6..2734f6ec 100644
--- a/ale_linters/cuda/nvcc.vim
+++ b/ale_linters/cuda/nvcc.vim
@@ -5,9 +5,6 @@ call ale#Set('cuda_nvcc_executable', 'nvcc')
 call ale#Set('cuda_nvcc_options', '-std=c++11')
 
 function! ale_linters#cuda#nvcc#GetCommand(buffer) abort
-    " Unused: use ale#util#nul_file
-    " let l:output_file = ale#util#Tempname() . '.ii'
-    " call ale#command#ManageFile(a:buffer, l:output_file)
     return '%e -cuda'
     \   . ale#Pad(ale#c#IncludeOptions(ale#c#FindLocalHeaderPaths(a:buffer)))
     \   . ale#Pad(ale#Var(a:buffer, 'cuda_nvcc_options'))
diff --git a/ale_linters/eruby/ruumba.vim b/ale_linters/eruby/ruumba.vim
index 2e84acf7..f415f1ab 100644
--- a/ale_linters/eruby/ruumba.vim
+++ b/ale_linters/eruby/ruumba.vim
@@ -11,7 +11,7 @@ function! ale_linters#eruby#ruumba#GetCommand(buffer) abort
     return ale#ruby#EscapeExecutable(l:executable, 'ruumba')
     \   . ' --format json --force-exclusion '
     \   . ale#Var(a:buffer, 'eruby_ruumba_options')
-    \   . ' --stdin ' . ale#Escape(expand('#' . a:buffer . ':p'))
+    \   . ' --stdin %s'
 endfunction
 
 function! ale_linters#eruby#ruumba#Handle(buffer, lines) abort
diff --git a/ale_linters/nasm/nasm.vim b/ale_linters/nasm/nasm.vim
index 347abc1b..c4f53629 100644
--- a/ale_linters/nasm/nasm.vim
+++ b/ale_linters/nasm/nasm.vim
@@ -7,10 +7,9 @@ call ale#Set('nasm_nasm_options', '')
 function! ale_linters#nasm#nasm#GetCommand(buffer) abort
     " Note that NASM requires a trailing slash for the -I option.
     let l:separator = has('win32') ? '\' : '/'
-    let l:path = fnamemodify(bufname(a:buffer), ':p:h') . l:separator
     let l:output_null = has('win32') ? 'NUL' : '/dev/null'
 
-    return '%e -X gnu -I ' . ale#Escape(l:path)
+    return '%e -X gnu -I %s:h' . l:separator
     \   . ale#Pad(ale#Var(a:buffer, 'nasm_nasm_options'))
     \   . ' %s'
     \   . ' -o ' . l:output_null
diff --git a/ale_linters/objc/clang.vim b/ale_linters/objc/clang.vim
index 7873dccd..cafb97db 100644
--- a/ale_linters/objc/clang.vim
+++ b/ale_linters/objc/clang.vim
@@ -10,7 +10,7 @@ function! ale_linters#objc#clang#GetCommand(buffer) abort
     " -iquote with the directory the file is in makes #include work for
     "  headers in the same directory.
     return 'clang -S -x objective-c -fsyntax-only '
-    \   . '-iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h'))
+    \   . '-iquote %s:h'
     \   . ' ' . ale#Var(a:buffer, 'objc_clang_options') . ' -'
 endfunction
 
diff --git a/ale_linters/objcpp/clang.vim b/ale_linters/objcpp/clang.vim
index 4dbe55b3..35a40c6f 100644
--- a/ale_linters/objcpp/clang.vim
+++ b/ale_linters/objcpp/clang.vim
@@ -10,7 +10,7 @@ function! ale_linters#objcpp#clang#GetCommand(buffer) abort
     " -iquote with the directory the file is in makes #include work for
     "  headers in the same directory.
     return 'clang++ -S -x objective-c++ -fsyntax-only '
-    \   . '-iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h'))
+    \   . '-iquote %s:h'
     \   . ' ' . ale#Var(a:buffer, 'objcpp_clang_options') . ' -'
 endfunction
 
diff --git a/ale_linters/pyrex/cython.vim b/ale_linters/pyrex/cython.vim
index 84382ba1..247c3060 100644
--- a/ale_linters/pyrex/cython.vim
+++ b/ale_linters/pyrex/cython.vim
@@ -6,9 +6,7 @@ call ale#Set('pyrex_cython_executable', 'cython')
 call ale#Set('pyrex_cython_options', '--warning-extra')
 
 function! ale_linters#pyrex#cython#GetCommand(buffer) abort
-    let l:local_dir = ale#Escape(fnamemodify(bufname(a:buffer), ':p:h'))
-
-    return '%e --working ' . l:local_dir . ' --include-dir ' . l:local_dir
+    return '%e --working %s:h --include-dir %s:h'
     \   . ale#Pad(ale#Var(a:buffer, 'pyrex_cython_options'))
     \   . ' --output-file ' . g:ale#util#nul_file . ' %t'
 endfunction
diff --git a/ale_linters/python/pydocstyle.vim b/ale_linters/python/pydocstyle.vim
index 3901db4d..69ae3807 100644
--- a/ale_linters/python/pydocstyle.vim
+++ b/ale_linters/python/pydocstyle.vim
@@ -16,17 +16,15 @@ function! ale_linters#python#pydocstyle#GetExecutable(buffer) abort
 endfunction
 
 function! ale_linters#python#pydocstyle#GetCommand(buffer) abort
-    let l:dir = fnamemodify(bufname(a:buffer), ':p:h')
     let l:executable = ale_linters#python#pydocstyle#GetExecutable(a:buffer)
-
     let l:exec_args = l:executable =~? 'pipenv$'
     \   ? ' run pydocstyle'
     \   : ''
 
-    return ale#path#CdString(l:dir)
+    return ale#path#BufferCdString(a:buffer)
     \   . ale#Escape(l:executable) . l:exec_args
-    \   . ' ' . ale#Var(a:buffer, 'python_pydocstyle_options')
-    \   . ' ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:t'))
+    \   . ale#Pad(ale#Var(a:buffer, 'python_pydocstyle_options'))
+    \   . ' %s:t'
 endfunction
 
 function! ale_linters#python#pydocstyle#Handle(buffer, lines) abort
diff --git a/ale_linters/ruby/rubocop.vim b/ale_linters/ruby/rubocop.vim
index 410ed0ea..483806a6 100644
--- a/ale_linters/ruby/rubocop.vim
+++ b/ale_linters/ruby/rubocop.vim
@@ -10,7 +10,7 @@ function! ale_linters#ruby#rubocop#GetCommand(buffer) abort
     return ale#ruby#EscapeExecutable(l:executable, 'rubocop')
     \   . ' --format json --force-exclusion '
     \   . ale#Var(a:buffer, 'ruby_rubocop_options')
-    \   . ' --stdin ' . ale#Escape(expand('#' . a:buffer . ':p'))
+    \   . ' --stdin %s'
 endfunction
 
 function! ale_linters#ruby#rubocop#GetType(severity) abort
diff --git a/ale_linters/ruby/standardrb.vim b/ale_linters/ruby/standardrb.vim
index f751e803..6ccfd2d6 100644
--- a/ale_linters/ruby/standardrb.vim
+++ b/ale_linters/ruby/standardrb.vim
@@ -11,7 +11,7 @@ function! ale_linters#ruby#standardrb#GetCommand(buffer) abort
     return ale#ruby#EscapeExecutable(l:executable, 'standardrb')
     \   . ' --format json --force-exclusion '
     \   . ale#Var(a:buffer, 'ruby_standardrb_options')
-    \   . ' --stdin ' . ale#Escape(expand('#' . a:buffer . ':p'))
+    \   . ' --stdin %s'
 endfunction
 
 " standardrb is based on RuboCop so the callback is the same
diff --git a/autoload/ale/c.vim b/autoload/ale/c.vim
index 64668dd5..d0a4fa06 100644
--- a/autoload/ale/c.vim
+++ b/autoload/ale/c.vim
@@ -501,10 +501,10 @@ endfunction
 
 function! ale#c#GetMakeCommand(buffer) abort
     if s:CanParseMakefile(a:buffer)
-        let l:makefile_path = ale#path#FindNearestFile(a:buffer, 'Makefile')
+        let l:path = ale#path#FindNearestFile(a:buffer, 'Makefile')
 
-        if !empty(l:makefile_path)
-            return 'cd '. fnamemodify(l:makefile_path, ':p:h') . ' && make -n'
+        if !empty(l:path)
+            return ale#path#CdString(fnamemodify(l:path, ':h')) . 'make -n'
         endif
     endif
 
diff --git a/autoload/ale/fixers/ocamlformat.vim b/autoload/ale/fixers/ocamlformat.vim
index 9b7c3e12..b12d2eb9 100644
--- a/autoload/ale/fixers/ocamlformat.vim
+++ b/autoload/ale/fixers/ocamlformat.vim
@@ -5,14 +5,13 @@ 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)
-    \       . ' --name=' . ale#Escape(l:filename)
+    \       . ' --name=%s'
     \       . ' -'
     \}
 endfunction
diff --git a/autoload/ale/fixers/rubocop.vim b/autoload/ale/fixers/rubocop.vim
index d9615256..cdfb014a 100644
--- a/autoload/ale/fixers/rubocop.vim
+++ b/autoload/ale/fixers/rubocop.vim
@@ -29,8 +29,7 @@ function! ale#fixers#rubocop#GetCommand(buffer) abort
     \   . (!empty(l:config) ? ' --config ' . ale#Escape(l:config) : '')
     \   . (!empty(l:options) ? ' ' . l:options : '')
     \   . (l:auto_correct_all ? ' --auto-correct-all' : ' --auto-correct')
-    \   . ' --force-exclusion --stdin '
-    \   . ale#Escape(expand('#' . a:buffer . ':p'))
+    \   . ' --force-exclusion --stdin %s'
 endfunction
 
 function! ale#fixers#rubocop#Fix(buffer) abort
diff --git a/test/command_callback/test_ada_gcc_command_callbacks.vader b/test/command_callback/test_ada_gcc_command_callbacks.vader
index de6e355e..906b31a4 100644
--- a/test/command_callback/test_ada_gcc_command_callbacks.vader
+++ b/test/command_callback/test_ada_gcc_command_callbacks.vader
@@ -18,11 +18,10 @@ After:
   call ale#assert#TearDownLinterTest()
 
 Execute(The executable should be configurable):
-
   AssertLinter 'gcc',
   \ ale#Escape('gcc') . ' -x ada -c -gnatc'
   \ . ' -o ' . b:out_file
-  \ . ' -I ' . ale#Escape(getcwd())
+  \ . ' -I %s:h'
   \ . ' -gnatwa -gnatq %t'
 
   let b:ale_ada_gcc_executable = 'foo'
@@ -30,15 +29,14 @@ Execute(The executable should be configurable):
   AssertLinter 'foo',
   \ ale#Escape('foo') . ' -x ada -c -gnatc'
   \ . ' -o ' . b:out_file
-  \ . ' -I ' . ale#Escape(getcwd())
+  \ . ' -I %s:h'
   \ . ' -gnatwa -gnatq %t'
 
 Execute(The options should be configurable):
-
   let g:ale_ada_gcc_options = '--foo --bar'
 
   AssertLinter 'gcc',
   \ ale#Escape('gcc') . ' -x ada -c -gnatc'
   \ . ' -o ' . b:out_file
-  \ . ' -I ' . ale#Escape(getcwd())
+  \ . ' -I %s:h'
   \ . ' --foo --bar %t'
diff --git a/test/command_callback/test_asm_gcc_command_callbacks.vader b/test/command_callback/test_asm_gcc_command_callbacks.vader
index 42606ec0..5976b5f2 100644
--- a/test/command_callback/test_asm_gcc_command_callbacks.vader
+++ b/test/command_callback/test_asm_gcc_command_callbacks.vader
@@ -3,7 +3,7 @@ Before:
   call ale#test#SetFilename('test.cpp')
   let b:command_tail = ' -x assembler'
   \   . ' -o ' . (has('win32') ? 'nul': '/dev/null')
-  \   . '-iquote ' . ale#Escape(g:dir)
+  \   . '-iquote %s:h'
   \   . ' -Wall -'
 
 After:
diff --git a/test/command_callback/test_c_cc_command_callbacks.vader b/test/command_callback/test_c_cc_command_callbacks.vader
index 9d71d941..c8c2de7d 100644
--- a/test/command_callback/test_c_cc_command_callbacks.vader
+++ b/test/command_callback/test_c_cc_command_callbacks.vader
@@ -23,7 +23,7 @@ Before:
 
   let b:command_tail = ' -S -x c'
   \   . ' -o ' . (has('win32') ? 'nul': '/dev/null')
-  \   . ' -iquote ' . ale#Escape(getcwd())
+  \   . ' -iquote %s:h'
   \   . ' -std=c11 -Wall -'
 
 After:
diff --git a/test/command_callback/test_c_import_paths.vader b/test/command_callback/test_c_import_paths.vader
index 8384a659..3c2bd79b 100644
--- a/test/command_callback/test_c_import_paths.vader
+++ b/test/command_callback/test_c_import_paths.vader
@@ -43,7 +43,7 @@ Execute(The C cc linter should include 'include' directories for projects with a
   AssertLinter 'gcc',
   \ ale#Escape('gcc')
   \   . ' -S -x c -o ' . (has('win32') ? 'nul': '/dev/null')
-  \   . ' -iquote ' . ale#Escape(ale#path#Simplify(g:dir .  '/../test_c_projects/makefile_project/subdir'))
+  \   . ' -iquote %s:h'
   \   . ' -I' . ale#Escape(ale#path#Simplify(g:dir .  '/../test_c_projects/makefile_project/include'))
   \   . ' -'
 
@@ -55,7 +55,7 @@ Execute(The C cc linter should include 'include' directories for projects with a
   AssertLinter 'gcc',
   \ ale#Escape('gcc')
   \   . ' -S -x c -o ' . (has('win32') ? 'nul': '/dev/null')
-  \   . ' -iquote ' . ale#Escape(ale#path#Simplify(g:dir .  '/../test_c_projects/configure_project/subdir'))
+  \   . ' -iquote %s:h'
   \   . ' -I' . ale#Escape(ale#path#Simplify(g:dir .  '/../test_c_projects/configure_project/include'))
   \   . ' -'
 
@@ -67,7 +67,7 @@ Execute(The C cc linter should include root directories for projects with .h fil
   AssertLinter 'gcc',
   \ ale#Escape('gcc')
   \   . ' -S -x c -o ' . (has('win32') ? 'nul': '/dev/null')
-  \   . ' -iquote ' . ale#Escape(ale#path#Simplify(g:dir .  '/../test_c_projects/h_file_project/subdir'))
+  \   . ' -iquote %s:h'
   \   . ' -I' . ale#Escape(ale#path#Simplify(g:dir .  '/../test_c_projects/h_file_project'))
   \   . ' -'
 
@@ -79,7 +79,7 @@ Execute(The C cc linter should include root directories for projects with .hpp f
   AssertLinter 'gcc',
   \ ale#Escape('gcc')
   \   . ' -S -x c -o ' . (has('win32') ? 'nul': '/dev/null')
-  \   . ' -iquote ' . ale#Escape(ale#path#Simplify(g:dir .  '/../test_c_projects/hpp_file_project/subdir'))
+  \   . ' -iquote %s:h'
   \   . ' -I' . ale#Escape(ale#path#Simplify(g:dir .  '/../test_c_projects/hpp_file_project'))
   \   . ' -'
 
@@ -101,7 +101,7 @@ Execute(The C++ cc linter should include 'include' directories for projects with
   AssertLinter 'gcc',
   \   ale#Escape('gcc')
   \   . ' -S -x c++ -o ' . (has('win32') ? 'nul': '/dev/null')
-  \   . ' -iquote ' . ale#Escape(ale#path#Simplify(g:dir .  '/../test_c_projects/makefile_project/subdir'))
+  \   . ' -iquote %s:h'
   \   . ' -I' . ale#Escape(ale#path#Simplify(g:dir .  '/../test_c_projects/makefile_project/include'))
   \   . ' -'
 
@@ -113,7 +113,7 @@ Execute(The C++ cc linter should include 'include' directories for projects with
   AssertLinter 'gcc',
   \   ale#Escape('gcc')
   \   . ' -S -x c++ -o ' . (has('win32') ? 'nul': '/dev/null')
-  \   . ' -iquote ' . ale#Escape(ale#path#Simplify(g:dir .  '/../test_c_projects/configure_project/subdir'))
+  \   . ' -iquote %s:h'
   \   . ' -I' . ale#Escape(ale#path#Simplify(g:dir .  '/../test_c_projects/configure_project/include'))
   \   . ' -'
 
@@ -125,7 +125,7 @@ Execute(The C++ cc linter should include root directories for projects with .h f
   AssertLinter 'gcc',
   \   ale#Escape('gcc')
   \   . ' -S -x c++ -o ' . (has('win32') ? 'nul': '/dev/null')
-  \   . ' -iquote ' . ale#Escape(ale#path#Simplify(g:dir .  '/../test_c_projects/h_file_project/subdir'))
+  \   . ' -iquote %s:h'
   \   . ' -I' . ale#Escape(ale#path#Simplify(g:dir .  '/../test_c_projects/h_file_project'))
   \   . ' -'
 
@@ -137,7 +137,7 @@ Execute(The C++ cc linter should include root directories for projects with .hpp
   AssertLinter 'gcc',
   \   ale#Escape('gcc')
   \   . ' -S -x c++ -o ' . (has('win32') ? 'nul': '/dev/null')
-  \   . ' -iquote ' . ale#Escape(ale#path#Simplify(g:dir .  '/../test_c_projects/hpp_file_project/subdir'))
+  \   . ' -iquote %s:h'
   \   . ' -I' . ale#Escape(ale#path#Simplify(g:dir .  '/../test_c_projects/hpp_file_project'))
   \   . ' -'
 
diff --git a/test/command_callback/test_cpp_gcc_command_callbacks.vader b/test/command_callback/test_cpp_cc_command_callbacks.vader
index 930cc68a..dec3a07c 100644
--- a/test/command_callback/test_cpp_gcc_command_callbacks.vader
+++ b/test/command_callback/test_cpp_cc_command_callbacks.vader
@@ -23,7 +23,7 @@ Before:
 
   let b:command_tail = ' -S -x c++'
   \   . ' -o ' . (has('win32') ? 'nul': '/dev/null')
-  \   . ' -iquote ' . ale#Escape(getcwd())
+  \   . ' -iquote %s:h'
   \   . ' -std=c++14 -Wall -'
 
 After:
diff --git a/test/command_callback/test_nasm_nasm_command_callbacks.vader b/test/command_callback/test_nasm_nasm_command_callbacks.vader
index 8e077306..2bfe2b0d 100644
--- a/test/command_callback/test_nasm_nasm_command_callbacks.vader
+++ b/test/command_callback/test_nasm_nasm_command_callbacks.vader
@@ -2,9 +2,9 @@ Before:
   call ale#assert#SetUpLinterTest('nasm', 'nasm')
 
   let b:command_tail =
-  \ ' -X gnu -I ' . ale#Escape(getcwd() . (has('win32') ? '\' : '/')) . ' %s -o ' . (has('win32') ? 'NUL' : '/dev/null')
+  \ ' -X gnu -I %s:h' . (has('win32') ? '\' : '/') . ' %s -o ' . (has('win32') ? 'NUL' : '/dev/null')
   let b:command_tail_opt =
-  \ ' -X gnu -I ' . ale#Escape(getcwd() . (has('win32') ? '\' : '/')) . ' -w+orphan-labels %s -o ' . (has('win32') ? 'NUL' : '/dev/null')
+  \ ' -X gnu -I %s:h' . (has('win32') ? '\' : '/') . ' -w+orphan-labels %s -o ' . (has('win32') ? 'NUL' : '/dev/null')
 
 After:
   unlet! b:command_tail
@@ -23,7 +23,8 @@ Execute(The options should be configurable):
   let b:ale_nasm_nasm_options = '-w-macro-params'
 
   AssertLinter 'nasm', ale#Escape('nasm')
-  \ . ' -X gnu -I ' . ale#Escape(getcwd() . (has('win32') ? '\' : '/')) . ' -w-macro-params %s -o ' . (has('win32') ? 'NUL' : '/dev/null')
+  \ . ' -X gnu -I %s:h' . (has('win32') ? '\' : '/')
+  \ . ' -w-macro-params %s -o ' . (has('win32') ? 'NUL' : '/dev/null')
 
 Execute(The options should be used in command):
   let b:ale_nasm_nasm_options = '-w+orphan-labels'
diff --git a/test/command_callback/test_pydocstyle_command_callback.vader b/test/command_callback/test_pydocstyle_command_callback.vader
index 02177f36..511443a6 100644
--- a/test/command_callback/test_pydocstyle_command_callback.vader
+++ b/test/command_callback/test_pydocstyle_command_callback.vader
@@ -7,34 +7,34 @@ After:
 
 Execute(The pydocstyle command callback should return default string):
   AssertLinter 'pydocstyle',
-  \ ale#path#CdString(expand('#' . bufnr('') . ':p:h'))
-  \   . ale#Escape('pydocstyle') . '  ' . ale#Escape('test.py')
+  \ ale#path#BufferCdString(bufnr(''))
+  \   . ale#Escape('pydocstyle') . ' %s:t'
 
 Execute(The pydocstyle command callback should allow options):
   let g:ale_python_pydocstyle_options = '--verbose'
 
   AssertLinter 'pydocstyle',
-  \ ale#path#CdString(expand('#' . bufnr('') . ':p:h'))
-  \   . ale#Escape('pydocstyle') . ' --verbose ' . ale#Escape('test.py')
+  \ ale#path#BufferCdString(bufnr(''))
+  \   . ale#Escape('pydocstyle') . ' --verbose %s:t'
 
 Execute(The pydocstyle executable should be configurable):
   let g:ale_python_pydocstyle_executable = '~/.local/bin/pydocstyle'
 
   AssertLinter '~/.local/bin/pydocstyle',
-  \ ale#path#CdString(expand('#' . bufnr('') . ':p:h'))
-  \   . ale#Escape('~/.local/bin/pydocstyle') . '  ' . ale#Escape('test.py')
+  \ ale#path#BufferCdString(bufnr(''))
+  \   . ale#Escape('~/.local/bin/pydocstyle') . ' %s:t'
 
 Execute(Setting executable to 'pipenv' appends 'run pydocstyle'):
   let g:ale_python_pydocstyle_executable = 'path/to/pipenv'
 
   AssertLinter 'path/to/pipenv',
-  \ ale#path#CdString(expand('#' . bufnr('') . ':p:h'))
-  \   . ale#Escape('path/to/pipenv') . ' run pydocstyle  ' . ale#Escape('test.py')
+  \ ale#path#BufferCdString(bufnr(''))
+  \   . ale#Escape('path/to/pipenv') . ' run pydocstyle %s:t'
 
 Execute(Pipenv is detected when python_pydocstyle_auto_pipenv is set):
   let g:ale_python_pydocstyle_auto_pipenv = 1
   call ale#test#SetFilename('../python_fixtures/pipenv/whatever.py')
 
   AssertLinter 'pipenv',
-  \ ale#path#CdString(expand('#' . bufnr('') . ':p:h'))
-  \   . ale#Escape('pipenv') . ' run pydocstyle  ' . ale#Escape('whatever.py')
+  \ ale#path#BufferCdString(bufnr(''))
+  \   . ale#Escape('pipenv') . ' run pydocstyle %s:t'
diff --git a/test/command_callback/test_pyrex_cython_command_callback.vader b/test/command_callback/test_pyrex_cython_command_callback.vader
index b9020f11..af86366a 100644
--- a/test/command_callback/test_pyrex_cython_command_callback.vader
+++ b/test/command_callback/test_pyrex_cython_command_callback.vader
@@ -6,8 +6,8 @@ After:
 
 Execute(The default cython command should be correct):
   AssertLinter 'cython', ale#Escape('cython')
-  \   . ' --working ' . ale#Escape(g:dir)
-  \   . ' --include-dir ' . ale#Escape(g:dir)
+  \   . ' --working %s:h'
+  \   . ' --include-dir %s:h'
   \   . ' --warning-extra'
   \   . ' --output-file ' . g:ale#util#nul_file . ' %t'
 
@@ -15,8 +15,8 @@ Execute(The cython executable should be configurable):
   let b:ale_pyrex_cython_executable = 'cython_foobar'
 
   AssertLinter 'cython_foobar', ale#Escape('cython_foobar')
-  \   . ' --working ' . ale#Escape(g:dir)
-  \   . ' --include-dir ' . ale#Escape(g:dir)
+  \   . ' --working %s:h'
+  \   . ' --include-dir %s:h'
   \   . ' --warning-extra'
   \   . ' --output-file ' . g:ale#util#nul_file . ' %t'
 
@@ -24,7 +24,7 @@ Execute(Additional cython options should be configurable):
   let b:ale_pyrex_cython_options = '--foobar'
 
   AssertLinter 'cython', ale#Escape('cython')
-  \   . ' --working ' . ale#Escape(g:dir)
-  \   . ' --include-dir ' . ale#Escape(g:dir)
+  \   . ' --working %s:h'
+  \   . ' --include-dir %s:h'
   \   . ' --foobar'
   \   . ' --output-file ' . g:ale#util#nul_file . ' %t'
diff --git a/test/command_callback/test_rubocop_command_callback.vader b/test/command_callback/test_rubocop_command_callback.vader
index 7f42a8c0..e7cc32e8 100644
--- a/test/command_callback/test_rubocop_command_callback.vader
+++ b/test/command_callback/test_rubocop_command_callback.vader
@@ -10,20 +10,17 @@ After:
 
 Execute(Executable should default to rubocop):
   AssertLinter 'rubocop', ale#Escape('rubocop')
-  \   . ' --format json --force-exclusion  --stdin '
-  \   . ale#Escape(ale#path#Simplify(g:dir . '/dummy.rb'))
+  \   . ' --format json --force-exclusion  --stdin %s'
 
 Execute(Should be able to set a custom executable):
   let g:ale_ruby_rubocop_executable = 'bin/rubocop'
 
   AssertLinter 'bin/rubocop' , ale#Escape('bin/rubocop')
-  \   . ' --format json --force-exclusion  --stdin '
-  \   . ale#Escape(ale#path#Simplify(g:dir . '/dummy.rb'))
+  \   . ' --format json --force-exclusion  --stdin %s'
 
 Execute(Setting bundle appends 'exec rubocop'):
   let g:ale_ruby_rubocop_executable = 'path to/bundle'
 
   AssertLinter 'path to/bundle', ale#Escape('path to/bundle')
   \   . ' exec rubocop'
-  \   . ' --format json --force-exclusion  --stdin '
-  \   . ale#Escape(ale#path#Simplify(g:dir . '/dummy.rb'))
+  \   . ' --format json --force-exclusion  --stdin %s'
diff --git a/test/command_callback/test_ruumba_command_callback.vader b/test/command_callback/test_ruumba_command_callback.vader
index 244b264a..9fa48903 100644
--- a/test/command_callback/test_ruumba_command_callback.vader
+++ b/test/command_callback/test_ruumba_command_callback.vader
@@ -10,20 +10,17 @@ After:
 
 Execute(Executable should default to ruumba):
   AssertLinter 'ruumba', ale#Escape('ruumba')
-  \   . ' --format json --force-exclusion  --stdin '
-  \   . ale#Escape(ale#path#Simplify(g:dir . '/dummy.html.erb'))
+  \   . ' --format json --force-exclusion  --stdin %s'
 
 Execute(Should be able to set a custom executable):
   let g:ale_eruby_ruumba_executable = 'bin/ruumba'
 
   AssertLinter 'bin/ruumba' , ale#Escape('bin/ruumba')
-  \   . ' --format json --force-exclusion  --stdin '
-  \   . ale#Escape(ale#path#Simplify(g:dir . '/dummy.html.erb'))
+  \   . ' --format json --force-exclusion  --stdin %s'
 
 Execute(Setting bundle appends 'exec ruumba'):
   let g:ale_eruby_ruumba_executable = 'path to/bundle'
 
   AssertLinter 'path to/bundle', ale#Escape('path to/bundle')
   \   . ' exec ruumba'
-  \   . ' --format json --force-exclusion  --stdin '
-  \   . ale#Escape(ale#path#Simplify(g:dir . '/dummy.html.erb'))
+  \   . ' --format json --force-exclusion  --stdin %s'
diff --git a/test/command_callback/test_standardrb_command_callback.vader b/test/command_callback/test_standardrb_command_callback.vader
index 7bc1c976..108dd870 100644
--- a/test/command_callback/test_standardrb_command_callback.vader
+++ b/test/command_callback/test_standardrb_command_callback.vader
@@ -10,20 +10,17 @@ After:
 
 Execute(Executable should default to standardrb):
   AssertLinter 'standardrb', ale#Escape('standardrb')
-  \   . ' --format json --force-exclusion  --stdin '
-  \   . ale#Escape(ale#path#Simplify(g:dir . '/dummy.rb'))
+  \   . ' --format json --force-exclusion  --stdin %s'
 
 Execute(Should be able to set a custom executable):
   let g:ale_ruby_standardrb_executable = 'bin/standardrb'
 
   AssertLinter 'bin/standardrb' , ale#Escape('bin/standardrb')
-  \   . ' --format json --force-exclusion  --stdin '
-  \   . ale#Escape(ale#path#Simplify(g:dir . '/dummy.rb'))
+  \   . ' --format json --force-exclusion  --stdin %s'
 
 Execute(Setting bundle appends 'exec standardrb'):
   let g:ale_ruby_standardrb_executable = 'path to/bundle'
 
   AssertLinter 'path to/bundle', ale#Escape('path to/bundle')
   \   . ' exec standardrb'
-  \   . ' --format json --force-exclusion  --stdin '
-  \   . ale#Escape(ale#path#Simplify(g:dir . '/dummy.rb'))
+  \   . ' --format json --force-exclusion  --stdin %s'
diff --git a/test/fixers/test_ocamlformat_fixer_callback.vader b/test/fixers/test_ocamlformat_fixer_callback.vader
index f0c36ed7..0ccdb070 100644
--- a/test/fixers/test_ocamlformat_fixer_callback.vader
+++ b/test/fixers/test_ocamlformat_fixer_callback.vader
@@ -19,8 +19,7 @@ Execute(The ocamlformat callback should return the correct default values):
   AssertEqual
   \ {
   \   'command': ale#Escape('xxxinvalid')
-  \     . ' --name=' . ale#Escape(bufname(bufnr('')))
-  \     . ' -',
+  \     . ' --name=%s -',
   \ },
   \ ale#fixers#ocamlformat#Fix(bufnr(''))
 
@@ -32,7 +31,6 @@ Execute(The ocamlformat callback should include custom ocamlformat options):
   \ {
   \   'command': ale#Escape('xxxinvalid')
   \     . ' ' . g:ale_ocaml_ocamlformat_options
-  \     . ' --name=' . ale#Escape(bufname(bufnr('')))
-  \     . ' -',
+  \     . ' --name=%s -',
   \ },
   \ ale#fixers#ocamlformat#Fix(bufnr(''))
diff --git a/test/fixers/test_rubocop_fixer_callback.vader b/test/fixers/test_rubocop_fixer_callback.vader
index 305881e0..84579d31 100644
--- a/test/fixers/test_rubocop_fixer_callback.vader
+++ b/test/fixers/test_rubocop_fixer_callback.vader
@@ -23,8 +23,7 @@ Execute(The rubocop callback should return the correct default values):
   \ {
   \   'process_with': 'ale#fixers#rubocop#PostProcess',
   \   'command': ale#Escape(g:ale_ruby_rubocop_executable)
-  \     . ' --auto-correct --force-exclusion --stdin '
-  \     . ale#Escape(expand('#' . bufnr('') . ':p')),
+  \     . ' --auto-correct --force-exclusion --stdin %s',
   \ },
   \ ale#fixers#rubocop#Fix(bufnr(''))
 
@@ -36,8 +35,7 @@ Execute(The rubocop callback should include configuration files):
   \   'process_with': 'ale#fixers#rubocop#PostProcess',
   \   'command': ale#Escape(g:ale_ruby_rubocop_executable)
   \     . ' --config ' . ale#Escape(ale#path#Simplify(g:dir . '/ruby_paths/with_config/.rubocop.yml'))
-  \     . ' --auto-correct --force-exclusion --stdin '
-  \     . ale#Escape(expand('#' . bufnr('') . ':p')),
+  \     . ' --auto-correct --force-exclusion --stdin %s',
   \ },
   \ ale#fixers#rubocop#Fix(bufnr(''))
 
@@ -51,8 +49,7 @@ Execute(The rubocop callback should include custom rubocop options):
   \   'command': ale#Escape(g:ale_ruby_rubocop_executable)
   \     . ' --config ' . ale#Escape(ale#path#Simplify(g:dir . '/ruby_paths/with_config/.rubocop.yml'))
   \     . ' --except Lint/Debugger'
-  \     . ' --auto-correct --force-exclusion --stdin '
-  \     . ale#Escape(expand('#' . bufnr('') . ':p')),
+  \     . ' --auto-correct --force-exclusion --stdin %s',
   \ },
   \ ale#fixers#rubocop#Fix(bufnr(''))
 
@@ -65,8 +62,7 @@ Execute(The rubocop callback should use auto-correct-all option when set):
   \   'process_with': 'ale#fixers#rubocop#PostProcess',
   \   'command': ale#Escape(g:ale_ruby_rubocop_executable)
   \     . ' --config ' . ale#Escape(ale#path#Simplify(g:dir . '/ruby_paths/with_config/.rubocop.yml'))
-  \     . ' --auto-correct-all --force-exclusion --stdin '
-  \     . ale#Escape(expand('#' . bufnr('') . ':p')),
+  \     . ' --auto-correct-all --force-exclusion --stdin %s'
   \ },
   \ ale#fixers#rubocop#Fix(bufnr(''))