#540 Fix shell escaping pretty much everywhere

37 files changed, 85 insertions, 87 deletions

diff --git a/ale_linters/asm/gcc.vim b/ale_linters/asm/gcc.vim
index 4288f5de..1ff348d8 100644
--- a/ale_linters/asm/gcc.vim
+++ b/ale_linters/asm/gcc.vim
@@ -5,7 +5,7 @@ let g:ale_asm_gcc_options = get(g:, 'ale_asm_gcc_options', '-Wall')
 
 function! ale_linters#asm#gcc#GetCommand(buffer) abort
     return 'gcc -x assembler -fsyntax-only '
-    \    . '-iquote ' . fnameescape(fnamemodify(bufname(a:buffer), ':p:h'))
+    \    . '-iquote ' . shellescape(fnamemodify(bufname(a:buffer), ':p:h'))
     \    . ' ' . ale#Var(a:buffer, 'asm_gcc_options') . ' -'
 endfunction
 
diff --git a/ale_linters/c/clang.vim b/ale_linters/c/clang.vim
index 38e0d480..8a5c84c2 100644
--- a/ale_linters/c/clang.vim
+++ b/ale_linters/c/clang.vim
@@ -13,7 +13,7 @@ function! ale_linters#c#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 c -fsyntax-only '
-    \   . '-iquote ' . fnameescape(fnamemodify(bufname(a:buffer), ':p:h'))
+    \   . '-iquote ' . shellescape(fnamemodify(bufname(a:buffer), ':p:h'))
     \   . ' ' . ale#Var(a:buffer, 'c_clang_options') . ' -'
 endfunction
 
diff --git a/ale_linters/c/gcc.vim b/ale_linters/c/gcc.vim
index 7eed0f45..b783a7d7 100644
--- a/ale_linters/c/gcc.vim
+++ b/ale_linters/c/gcc.vim
@@ -13,7 +13,7 @@ function! ale_linters#c#gcc#GetCommand(buffer) abort
     " -iquote with the directory the file is in makes #include work for
     "  headers in the same directory.
     return 'gcc -S -x c -fsyntax-only '
-    \   . '-iquote ' . fnameescape(fnamemodify(bufname(a:buffer), ':p:h'))
+    \   . '-iquote ' . shellescape(fnamemodify(bufname(a:buffer), ':p:h'))
     \   . ' ' . ale#Var(a:buffer, 'c_gcc_options') . ' -'
 endfunction
 
diff --git a/ale_linters/cpp/clang.vim b/ale_linters/cpp/clang.vim
index b830f6a7..bd4d26ef 100644
--- a/ale_linters/cpp/clang.vim
+++ b/ale_linters/cpp/clang.vim
@@ -10,7 +10,7 @@ function! ale_linters#cpp#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 c++ -fsyntax-only '
-    \   . '-iquote ' . fnameescape(fnamemodify(bufname(a:buffer), ':p:h'))
+    \   . '-iquote ' . shellescape(fnamemodify(bufname(a:buffer), ':p:h'))
     \   . ' ' . ale#Var(a:buffer, 'cpp_clang_options') . ' -'
 endfunction
 
diff --git a/ale_linters/cpp/gcc.vim b/ale_linters/cpp/gcc.vim
index 19de0c9c..981caec0 100644
--- a/ale_linters/cpp/gcc.vim
+++ b/ale_linters/cpp/gcc.vim
@@ -20,7 +20,7 @@ function! ale_linters#cpp#gcc#GetCommand(buffer) abort
     " -iquote with the directory the file is in makes #include work for
     "  headers in the same directory.
     return 'gcc -S -x c++ -fsyntax-only '
-    \   . '-iquote ' . fnameescape(fnamemodify(bufname(a:buffer), ':p:h'))
+    \   . '-iquote ' . shellescape(fnamemodify(bufname(a:buffer), ':p:h'))
     \   . ' ' . ale#Var(a:buffer, 'cpp_gcc_options') . ' -'
 endfunction
 
diff --git a/ale_linters/css/csslint.vim b/ale_linters/css/csslint.vim
index fb262497..83698f54 100644
--- a/ale_linters/css/csslint.vim
+++ b/ale_linters/css/csslint.vim
@@ -4,7 +4,7 @@
 function! ale_linters#css#csslint#GetCommand(buffer) abort
     let l:csslintrc = ale#path#FindNearestFile(a:buffer, '.csslintrc')
     let l:config_option = !empty(l:csslintrc)
-    \   ? '--config=' . fnameescape(l:csslintrc)
+    \   ? '--config=' . shellescape(l:csslintrc)
     \   : ''
 
     return 'csslint --format=compact ' . l:config_option . ' %t'
diff --git a/ale_linters/d/dmd.vim b/ale_linters/d/dmd.vim
index 3805e024..7068681b 100644
--- a/ale_linters/d/dmd.vim
+++ b/ale_linters/d/dmd.vim
@@ -31,7 +31,7 @@ function! ale_linters#d#dmd#DUBCommand(buffer) abort
     " To support older dub versions, we just change the directory to
     " the directory where we found the dub config, and then run `dub describe`
     " from that directory.
-    return 'cd ' . fnameescape(fnamemodify(l:dub_file, ':h'))
+    return 'cd ' . shellescape(fnamemodify(l:dub_file, ':h'))
     \   . ' && dub describe --import-paths'
 endfunction
 
@@ -42,7 +42,7 @@ function! ale_linters#d#dmd#DMDCommand(buffer, dub_output) abort
     for l:line in a:dub_output
         if !empty(l:line)
             " The arguments must be '-Ifilename', not '-I filename'
-            call add(l:import_list, '-I' . fnameescape(l:line))
+            call add(l:import_list, '-I' . shellescape(l:line))
         endif
     endfor
 
diff --git a/ale_linters/elm/make.vim b/ale_linters/elm/make.vim
index 32f824e0..75a124ae 100644
--- a/ale_linters/elm/make.vim
+++ b/ale_linters/elm/make.vim
@@ -43,7 +43,7 @@ function! ale_linters#elm#make#GetCommand(buffer) abort
         let l:dir_set_cmd = ''
     else
         let l:root_dir = fnamemodify(l:elm_package, ':p:h')
-        let l:dir_set_cmd = 'cd ' . fnameescape(l:root_dir) . ' && '
+        let l:dir_set_cmd = 'cd ' . shellescape(l:root_dir) . ' && '
     endif
 
     " The elm-make compiler, at the time of this writing, uses '/dev/null' as
diff --git a/ale_linters/erlang/erlc.vim b/ale_linters/erlang/erlc.vim
index a44e9887..1b0f16cc 100644
--- a/ale_linters/erlang/erlc.vim
+++ b/ale_linters/erlang/erlc.vim
@@ -6,7 +6,7 @@ function! ale_linters#erlang#erlc#GetCommand(buffer) abort
     let l:output_file = tempname()
     call ale#engine#ManageFile(a:buffer, l:output_file)
 
-    return 'erlc -o ' . fnameescape(l:output_file)
+    return 'erlc -o ' . shellescape(l:output_file)
     \   . ' ' . ale#Var(a:buffer, 'erlang_erlc_options')
     \   . ' %t'
 endfunction
diff --git a/ale_linters/go/gometalinter.vim b/ale_linters/go/gometalinter.vim
index 6ad78cab..9913f21a 100644
--- a/ale_linters/go/gometalinter.vim
+++ b/ale_linters/go/gometalinter.vim
@@ -8,7 +8,7 @@ endif
 function! ale_linters#go#gometalinter#GetCommand(buffer) abort
     return 'gometalinter '
     \   . ale#Var(a:buffer, 'go_gometalinter_options')
-    \   . ' ' . fnameescape(fnamemodify(bufname(a:buffer), ':p:h'))
+    \   . ' ' . shellescape(fnamemodify(bufname(a:buffer), ':p:h'))
 endfunction
 
 function! ale_linters#go#gometalinter#GetMatches(lines) abort
diff --git a/ale_linters/java/javac.vim b/ale_linters/java/javac.vim
index 5a109997..2966d069 100644
--- a/ale_linters/java/javac.vim
+++ b/ale_linters/java/javac.vim
@@ -41,14 +41,13 @@ endfunction
 function! s:BuildClassPathOption(buffer, import_paths) abort
     " Filter out lines like [INFO], etc.
     let l:class_paths = filter(a:import_paths[:], 'v:val !~# ''[''')
-    call map(l:class_paths, 'fnameescape(v:val)')
     call extend(
     \   l:class_paths,
     \   split(ale#Var(a:buffer, 'java_javac_classpath'), s:classpath_sep),
     \)
 
     return !empty(l:class_paths)
-    \   ? '-cp ' . join(l:class_paths, s:classpath_sep)
+    \   ? '-cp ' . shellescape(join(l:class_paths, s:classpath_sep))
     \   : ''
 endfunction
 
@@ -65,7 +64,7 @@ function! ale_linters#java#javac#GetCommand(buffer, import_paths) abort
     let l:src_dir = ale#path#FindNearestDirectory(a:buffer, 'src/main/java')
 
     if !empty(l:src_dir)
-        let l:sp_option = '-sourcepath ' . fnameescape(l:src_dir)
+        let l:sp_option = '-sourcepath ' . shellescape(l:src_dir)
     endif
 
     " Create .class files in a temporary directory, which we will delete later.
@@ -74,7 +73,7 @@ function! ale_linters#java#javac#GetCommand(buffer, import_paths) abort
     return 'javac -Xlint'
     \ . ' ' . l:cp_option
     \ . ' ' . l:sp_option
-    \ . ' -d ' . fnameescape(l:class_file_directory)
+    \ . ' -d ' . shellescape(l:class_file_directory)
     \ . ' ' . ale#Var(a:buffer, 'java_javac_options')
     \ . ' %t'
 endfunction
diff --git a/ale_linters/javascript/eslint.vim b/ale_linters/javascript/eslint.vim
index 67b65839..7e4929b4 100644
--- a/ale_linters/javascript/eslint.vim
+++ b/ale_linters/javascript/eslint.vim
@@ -34,7 +34,7 @@ function! ale_linters#javascript#eslint#GetExecutable(buffer) abort
 endfunction
 
 function! ale_linters#javascript#eslint#GetCommand(buffer) abort
-    return fnameescape(ale_linters#javascript#eslint#GetExecutable(a:buffer))
+    return shellescape(ale_linters#javascript#eslint#GetExecutable(a:buffer))
     \   . ' ' . ale#Var(a:buffer, 'javascript_eslint_options')
     \   . ' -f unix --stdin --stdin-filename %s'
 endfunction
diff --git a/ale_linters/javascript/flow.vim b/ale_linters/javascript/flow.vim
index 14f65126..36247cd1 100644
--- a/ale_linters/javascript/flow.vim
+++ b/ale_linters/javascript/flow.vim
@@ -27,7 +27,7 @@ function! ale_linters#javascript#flow#GetCommand(buffer) abort
         return ''
     endif
 
-    return fnameescape(ale_linters#javascript#flow#GetExecutable(a:buffer))
+    return shellescape(ale_linters#javascript#flow#GetExecutable(a:buffer))
     \   . ' check-contents --respect-pragma --json --from ale %s'
 endfunction
 
diff --git a/ale_linters/javascript/jshint.vim b/ale_linters/javascript/jshint.vim
index 657b0ff5..ec3c2c95 100644
--- a/ale_linters/javascript/jshint.vim
+++ b/ale_linters/javascript/jshint.vim
@@ -27,11 +27,11 @@ function! ale_linters#javascript#jshint#GetCommand(buffer) abort
     \   get(g:, 'ale_jshint_config_loc', '')
     \)
 
-    let l:command = fnameescape(ale_linters#javascript#jshint#GetExecutable(a:buffer))
+    let l:command = shellescape(ale_linters#javascript#jshint#GetExecutable(a:buffer))
     let l:command .= ' --reporter unix --extract auto'
 
     if !empty(l:jshint_config)
-        let l:command .= ' --config ' . fnameescape(l:jshint_config)
+        let l:command .= ' --config ' . shellescape(l:jshint_config)
     endif
 
     let l:command .= ' -'
diff --git a/ale_linters/javascript/standard.vim b/ale_linters/javascript/standard.vim
index 1b82823c..30ebae10 100644
--- a/ale_linters/javascript/standard.vim
+++ b/ale_linters/javascript/standard.vim
@@ -23,7 +23,7 @@ function! ale_linters#javascript#standard#GetExecutable(buffer) abort
 endfunction
 
 function! ale_linters#javascript#standard#GetCommand(buffer) abort
-    return fnameescape(ale_linters#javascript#standard#GetExecutable(a:buffer))
+    return shellescape(ale_linters#javascript#standard#GetExecutable(a:buffer))
     \   . ' ' . ale#Var(a:buffer, 'javascript_standard_options')
     \   . ' --stdin %s'
 endfunction
diff --git a/ale_linters/javascript/xo.vim b/ale_linters/javascript/xo.vim
index a3e9f999..b7a549f0 100644
--- a/ale_linters/javascript/xo.vim
+++ b/ale_linters/javascript/xo.vim
@@ -23,7 +23,7 @@ function! ale_linters#javascript#xo#GetExecutable(buffer) abort
 endfunction
 
 function! ale_linters#javascript#xo#GetCommand(buffer) abort
-    return fnameescape(ale_linters#javascript#xo#GetExecutable(a:buffer))
+    return shellescape(ale_linters#javascript#xo#GetExecutable(a:buffer))
     \   . ' ' . ale#Var(a:buffer, 'javascript_xo_options')
     \   . ' --reporter unix --stdin --stdin-filename %s'
 endfunction
diff --git a/ale_linters/kotlin/kotlinc.vim b/ale_linters/kotlin/kotlinc.vim
index 0ada361f..543c3a99 100644
--- a/ale_linters/kotlin/kotlinc.vim
+++ b/ale_linters/kotlin/kotlinc.vim
@@ -16,13 +16,13 @@ function! ale_linters#kotlin#kotlinc#GetCommand(buffer) abort
     " If the config file is enabled and readable, source it
     if ale#Var(a:buffer, 'kotlin_kotlinc_enable_config')
         if filereadable(expand(ale#Var(a:buffer, 'kotlin_kotlinc_config_file'), 1))
-            execute 'source ' . fnameescape(expand(ale#Var(a:buffer, 'kotlin_kotlinc_config_file'), 1))
+            execute 'source ' . shellescape(expand(ale#Var(a:buffer, 'kotlin_kotlinc_config_file'), 1))
         endif
     endif
 
     " If use module and module file is readable use that and return
     if ale#Var(a:buffer, 'kotlin_kotlinc_use_module_file')
-        let l:module_filename = fnameescape(expand(ale#Var(a:buffer, 'kotlin_kotlinc_module_filename'), 1))
+        let l:module_filename = shellescape(expand(ale#Var(a:buffer, 'kotlin_kotlinc_module_filename'), 1))
 
         if filereadable(l:module_filename)
             let l:kotlinc_opts .= ' -module ' . l:module_filename
diff --git a/ale_linters/lua/luacheck.vim b/ale_linters/lua/luacheck.vim
index 0098e66e..8e3e9869 100644
--- a/ale_linters/lua/luacheck.vim
+++ b/ale_linters/lua/luacheck.vim
@@ -12,7 +12,7 @@ function! ale_linters#lua#luacheck#GetExecutable(buffer) abort
 endfunction
 
 function! ale_linters#lua#luacheck#GetCommand(buffer) abort
-    return ale_linters#lua#luacheck#GetExecutable(a:buffer)
+    return shellescape(ale_linters#lua#luacheck#GetExecutable(a:buffer))
     \   . ' ' . ale#Var(a:buffer, 'lua_luacheck_options')
     \   . ' --formatter plain --codes --filename %s -'
 endfunction
diff --git a/ale_linters/nim/nimcheck.vim b/ale_linters/nim/nimcheck.vim
index 02a7c931..9bd19720 100644
--- a/ale_linters/nim/nimcheck.vim
+++ b/ale_linters/nim/nimcheck.vim
@@ -44,7 +44,7 @@ endfunction
 
 
 function! ale_linters#nim#nimcheck#GetCommand(buffer) abort
-    let l:directory = fnameescape(fnamemodify(bufname(a:buffer), ':p:h'))
+    let l:directory = shellescape(fnamemodify(bufname(a:buffer), ':p:h'))
 
     return 'nim check --path:' . l:directory
     \   . ' --threads:on --verbosity:0 --colors:off --listFullPaths %t'
diff --git a/ale_linters/python/flake8.vim b/ale_linters/python/flake8.vim
index 4959583f..99e93725 100644
--- a/ale_linters/python/flake8.vim
+++ b/ale_linters/python/flake8.vim
@@ -48,7 +48,7 @@ function! ale_linters#python#flake8#VersionCheck(buffer) abort
         return ''
     endif
 
-    let l:executable = fnameescape(ale_linters#python#flake8#GetExecutable(a:buffer))
+    let l:executable = shellescape(ale_linters#python#flake8#GetExecutable(a:buffer))
     let l:module_string = s:UsingModule(a:buffer) ? ' -m flake8' : ''
 
     return l:executable . l:module_string . ' --version'
@@ -89,7 +89,7 @@ function! ale_linters#python#flake8#GetCommand(buffer, version_output) abort
 
     let l:options = ale#Var(a:buffer, 'python_flake8_options')
 
-    return fnameescape(ale_linters#python#flake8#GetExecutable(a:buffer))
+    return shellescape(ale_linters#python#flake8#GetExecutable(a:buffer))
     \   . (!empty(l:options) ? ' ' . l:options : '')
     \   . l:display_name_args . ' -'
 endfunction
diff --git a/ale_linters/python/mypy.vim b/ale_linters/python/mypy.vim
index 135084da..7275af39 100644
--- a/ale_linters/python/mypy.vim
+++ b/ale_linters/python/mypy.vim
@@ -30,7 +30,7 @@ function! ale_linters#python#mypy#GetCommand(buffer) abort
     let l:executable = ale_linters#python#mypy#GetExecutable(a:buffer)
 
     return l:cd_command
-    \   . fnameescape(l:executable)
+    \   . shellescape(l:executable)
     \   . ' --show-column-numbers '
     \   . ale#Var(a:buffer, 'python_mypy_options')
     \   . ' %s'
diff --git a/ale_linters/python/pylint.vim b/ale_linters/python/pylint.vim
index b2cc07f3..cce28479 100644
--- a/ale_linters/python/pylint.vim
+++ b/ale_linters/python/pylint.vim
@@ -26,7 +26,7 @@ function! ale_linters#python#pylint#GetExecutable(buffer) abort
 endfunction
 
 function! ale_linters#python#pylint#GetCommand(buffer) abort
-    return fnameescape(ale_linters#python#pylint#GetExecutable(a:buffer))
+    return shellescape(ale_linters#python#pylint#GetExecutable(a:buffer))
     \   . ' ' . ale#Var(a:buffer, 'python_pylint_options')
     \   . ' --output-format text --msg-template="{path}:{line}:{column}: {msg_id} ({symbol}) {msg}" --reports n'
     \   . ' %s'
diff --git a/ale_linters/tex/chktex.vim b/ale_linters/tex/chktex.vim
index c65deede..776974ab 100644
--- a/ale_linters/tex/chktex.vim
+++ b/ale_linters/tex/chktex.vim
@@ -18,7 +18,7 @@ function! ale_linters#tex#chktex#GetCommand(buffer) abort
     let l:command .= ' -v0 -p stdin -q'
 
     if !empty(l:chktex_config)
-        let l:command .= ' -l ' . fnameescape(l:chktex_config)
+        let l:command .= ' -l ' . shellescape(l:chktex_config)
     endif
 
     let l:command .= ' ' . ale#Var(a:buffer, 'tex_chktex_options')
diff --git a/ale_linters/typescript/tslint.vim b/ale_linters/typescript/tslint.vim
index c56c8b23..8ba99cc4 100644
--- a/ale_linters/typescript/tslint.vim
+++ b/ale_linters/typescript/tslint.vim
@@ -55,7 +55,7 @@ function! ale_linters#typescript#tslint#BuildLintCommand(buffer) abort
     \)
 
     let l:tslint_config_option = !empty(l:tslint_config_path)
-    \   ? '-c ' . fnameescape(l:tslint_config_path)
+    \   ? '-c ' . shellescape(l:tslint_config_path)
     \   : ''
 
     return ale_linters#typescript#tslint#GetExecutable(a:buffer)
diff --git a/ale_linters/verilog/verilator.vim b/ale_linters/verilog/verilator.vim
index e2dbafac..ed26c1f2 100644
--- a/ale_linters/verilog/verilator.vim
+++ b/ale_linters/verilog/verilator.vim
@@ -8,7 +8,7 @@ function! ale_linters#verilog#verilator#GetCommand(buffer) abort
     call ale#engine#ManageFile(a:buffer, l:filename)
     call writefile(getbufline(a:buffer, 1, '$'), l:filename)
 
-    return 'verilator --lint-only -Wall -Wno-DECLFILENAME ' . fnameescape(l:filename)
+    return 'verilator --lint-only -Wall -Wno-DECLFILENAME ' . shellescape(l:filename)
 endfunction
 
 function! ale_linters#verilog#verilator#Handle(buffer, lines) abort
diff --git a/autoload/ale/engine.vim b/autoload/ale/engine.vim
index 047392d0..339f7ee9 100644
--- a/autoload/ale/engine.vim
+++ b/autoload/ale/engine.vim
@@ -480,14 +480,14 @@ function! ale#engine#FormatCommand(buffer, command) abort
     " file.
     if l:command =~# '%s'
         let l:filename = fnamemodify(bufname(a:buffer), ':p')
-        let l:command = substitute(l:command, '%s', '\=fnameescape(l:filename)', 'g')
+        let l:command = substitute(l:command, '%s', '\=shellescape(l:filename)', 'g')
     endif
 
     if l:command =~# '%t'
         " Create a temporary filename, <temp_dir>/<original_basename>
         " The file itself will not be created by this function.
         let l:temporary_file = s:TemporaryFilename(a:buffer)
-        let l:command = substitute(l:command, '%t', '\=fnameescape(l:temporary_file)', 'g')
+        let l:command = substitute(l:command, '%t', '\=shellescape(l:temporary_file)', 'g')
     endif
 
     " Finish formatting so %% becomes %.
@@ -529,7 +529,7 @@ function! s:RunJob(options) abort
         " in the shell. We'll write out the file to a temporary file,
         " and then read it back in, in the shell.
         let l:temporary_file = s:TemporaryFilename(l:buffer)
-        let l:command = l:command . ' < ' . fnameescape(l:temporary_file)
+        let l:command = l:command . ' < ' . shellescape(l:temporary_file)
     endif
 
     if s:CreateTemporaryFileForJob(l:buffer, l:temporary_file)
diff --git a/autoload/ale/path.vim b/autoload/ale/path.vim
index 0ea13351..26da9e24 100644
--- a/autoload/ale/path.vim
+++ b/autoload/ale/path.vim
@@ -47,7 +47,7 @@ endfunction
 " Output 'cd <directory> && '
 " This function can be used changing the directory for a linter command.
 function! ale#path#CdString(directory) abort
-    return 'cd ' . fnameescape(a:directory) . ' && '
+    return 'cd ' . shellescape(a:directory) . ' && '
 endfunction
 
 " Output 'cd <buffer_filename_directory> && '
diff --git a/test/command_callback/test_cppcheck_command_callbacks.vader b/test/command_callback/test_cppcheck_command_callbacks.vader
index 665b4f13..63958643 100644
--- a/test/command_callback/test_cppcheck_command_callbacks.vader
+++ b/test/command_callback/test_cppcheck_command_callbacks.vader
@@ -19,7 +19,7 @@ Execute(cppcheck for C should detect compile_commands.json files):
   cd cppcheck_paths/one
 
   AssertEqual
-  \ 'cd ' . fnameescape(b:dir . '/cppcheck_paths/one') . ' && '
+  \ 'cd ' . shellescape(b:dir . '/cppcheck_paths/one') . ' && '
   \ . 'cppcheck -q --language=c --project=compile_commands.json --enable=style %t',
   \ ale_linters#c#cppcheck#GetCommand(bufnr(''))
 
@@ -35,6 +35,6 @@ Execute(cppcheck for C++ should detect compile_commands.json files):
   cd cppcheck_paths/one
 
   AssertEqual
-  \ 'cd ' . fnameescape(b:dir . '/cppcheck_paths/one') . ' && '
+  \ 'cd ' . shellescape(b:dir . '/cppcheck_paths/one') . ' && '
   \ . 'cppcheck -q --language=c++ --project=compile_commands.json --enable=style %t',
   \ ale_linters#cpp#cppcheck#GetCommand(bufnr(''))
diff --git a/test/command_callback/test_flake8_command_callback.vader b/test/command_callback/test_flake8_command_callback.vader
index baec5335..7c1f8c78 100644
--- a/test/command_callback/test_flake8_command_callback.vader
+++ b/test/command_callback/test_flake8_command_callback.vader
@@ -22,26 +22,26 @@ Execute(The flake8 callbacks should return the correct default values):
   \ 'flake8',
   \ ale_linters#python#flake8#GetExecutable(bufnr(''))
   AssertEqual
-  \ 'flake8 --version',
+  \ '''flake8'' --version',
   \ ale_linters#python#flake8#VersionCheck(bufnr(''))
   AssertEqual
-  \ 'flake8 --stdin-display-name %s -',
+  \ '''flake8'' --stdin-display-name %s -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['3.0.0'])
   " Try with older versions.
   call ale_linters#python#flake8#ClearVersionCache()
   AssertEqual
-  \ 'flake8 -',
+  \ '''flake8'' -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['2.9.9'])
 
 Execute(The flake8 command callback should let you set options):
   let g:ale_python_flake8_options = '--some-option'
 
   AssertEqual
-  \ 'flake8 --some-option --stdin-display-name %s -',
+  \ '''flake8'' --some-option --stdin-display-name %s -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['3.0.4'])
   call ale_linters#python#flake8#ClearVersionCache()
   AssertEqual
-  \ 'flake8 --some-option -',
+  \ '''flake8'' --some-option -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['2.9.9'])
 
 Execute(You should be able to set a custom executable and it should be escaped):
@@ -51,10 +51,10 @@ Execute(You should be able to set a custom executable and it should be escaped):
   \ 'executable with spaces',
   \ ale_linters#python#flake8#GetExecutable(bufnr(''))
   AssertEqual
-  \ 'executable\ with\ spaces --version',
+  \ '''executable with spaces'' --version',
   \ ale_linters#python#flake8#VersionCheck(bufnr(''))
   AssertEqual
-  \ 'executable\ with\ spaces --stdin-display-name %s -',
+  \ '''executable with spaces'' --stdin-display-name %s -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['3.0.0'])
 
 Execute(The flake8 callbacks should detect virtualenv directories):
@@ -64,10 +64,10 @@ Execute(The flake8 callbacks should detect virtualenv directories):
   \ g:dir . '/python_paths/with_virtualenv/env/bin/flake8',
   \ ale_linters#python#flake8#GetExecutable(bufnr(''))
   AssertEqual
-  \ g:dir . '/python_paths/with_virtualenv/env/bin/flake8 --version',
+  \ '''' . g:dir . '/python_paths/with_virtualenv/env/bin/flake8'' --version',
   \ ale_linters#python#flake8#VersionCheck(bufnr(''))
   AssertEqual
-  \   g:dir . '/python_paths/with_virtualenv/env/bin/flake8'
+  \   '''' . g:dir . '/python_paths/with_virtualenv/env/bin/flake8'''
   \   . ' --stdin-display-name %s -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['3.0.0'])
 
@@ -82,10 +82,10 @@ Execute(Using `python -m flake8` should be supported for running flake8):
   \ 'python',
   \ ale_linters#python#flake8#GetExecutable(bufnr(''))
   AssertEqual
-  \ 'python -m flake8 --version',
+  \ '''python'' -m flake8 --version',
   \ ale_linters#python#flake8#VersionCheck(bufnr(''))
   AssertEqual
-  \ 'python -m flake8 --some-option -',
+  \ '''python'' -m flake8 --some-option -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['2.9.9'])
 
   call ale_linters#python#flake8#ClearVersionCache()
@@ -97,8 +97,8 @@ Execute(Using `python -m flake8` should be supported for running flake8):
   \ 'python',
   \ ale_linters#python#flake8#GetExecutable(bufnr(''))
   AssertEqual
-  \ 'python -m flake8 --version',
+  \ '''python'' -m flake8 --version',
   \ ale_linters#python#flake8#VersionCheck(bufnr(''))
   AssertEqual
-  \ 'python   -m flake8 --some-option -',
+  \ '''python''   -m flake8 --some-option -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['2.9.9'])
diff --git a/test/command_callback/test_javac_command_callback.vader b/test/command_callback/test_javac_command_callback.vader
index 534e63de..2f0bc50e 100644
--- a/test/command_callback/test_javac_command_callback.vader
+++ b/test/command_callback/test_javac_command_callback.vader
@@ -15,7 +15,7 @@ After:
 Execute(The javac callback should return the correct default value):
   let b:command = ale_linters#java#javac#GetCommand(bufnr(''), [])
 
-  Assert match(b:command, '\v^javac +-Xlint +-d +/tmp/[0-9a-zA-Z/]+ +\%t$') >= 0,
+  Assert match(b:command, '\v^javac +-Xlint +-d +''/tmp/[0-9a-zA-Z/]+'' +\%t$') >= 0,
   \ 'Invalid command string: ' . b:command
 
 Execute(The javac callback should use g:ale_java_javac_classpath correctly):
@@ -23,7 +23,7 @@ Execute(The javac callback should use g:ale_java_javac_classpath correctly):
 
   let b:command = ale_linters#java#javac#GetCommand(bufnr(''), [])
 
-  Assert match(b:command, '\v^javac +-Xlint +-cp +foo\.jar +-d +/tmp/[0-9a-zA-Z/]+ +\%t$') >= 0,
+  Assert match(b:command, '\v^javac +-Xlint +-cp ''+foo\.jar'' +-d ''+/tmp/[0-9a-zA-Z/]+'' +\%t$') >= 0,
   \ 'Invalid command string: ' . b:command
 
 Execute(The javac callback should include discovered classpaths):
@@ -34,7 +34,7 @@ Execute(The javac callback should include discovered classpaths):
   \ '/xyz/abc.jar',
   \])
 
-  Assert match(b:command, '\v^javac +-Xlint +-cp +/foo/bar\.jar:/xyz/abc\.jar +-d +/tmp/[0-9a-zA-Z/]+ +\%t$') >= 0,
+  Assert match(b:command, '\v^javac +-Xlint +-cp ''+/foo/bar\.jar:/xyz/abc\.jar'' +-d +''/tmp/[0-9a-zA-Z/]+'' +\%t$') >= 0,
   \ 'Invalid command string: ' . b:command
 
 Execute(The javac callback should combine discovered classpaths and manual ones):
@@ -47,7 +47,7 @@ Execute(The javac callback should combine discovered classpaths and manual ones)
   \ '/xyz/abc.jar',
   \])
 
-  Assert match(b:command, '\v^javac +-Xlint +-cp +/foo/bar\.jar:/xyz/abc\.jar:configured\.jar +-d +/tmp/[0-9a-zA-Z/]+ +\%t$') >= 0,
+  Assert match(b:command, '\v^javac +-Xlint +-cp +''/foo/bar\.jar:/xyz/abc\.jar:configured\.jar'' +-d ''+/tmp/[0-9a-zA-Z/]+'' +\%t$') >= 0,
   \ 'Invalid command string: ' . b:command
 
   let g:ale_java_javac_classpath = 'configured.jar:configured2.jar'
@@ -59,7 +59,7 @@ Execute(The javac callback should combine discovered classpaths and manual ones)
   \ '/xyz/abc.jar',
   \])
 
-  Assert match(b:command, '\v^javac +-Xlint +-cp +/foo/bar\.jar:/xyz/abc\.jar:configured\.jar:configured2\.jar +-d +/tmp/[0-9a-zA-Z/]+ +\%t$') >= 0,
+  Assert match(b:command, '\v^javac +-Xlint +-cp +''/foo/bar\.jar:/xyz/abc\.jar:configured\.jar:configured2\.jar'' +-d +''/tmp/[0-9a-zA-Z/]+'' +\%t$') >= 0,
   \ 'Invalid command string: ' . b:command
 
 Execute(The javac callback should detect source directories):
@@ -69,7 +69,7 @@ Execute(The javac callback should detect source directories):
 
   let b:command = ale_linters#java#javac#GetCommand(bufnr(''), [])
 
-  Assert match(b:command, '\v^javac +-Xlint +-sourcepath /.*java_paths/src/main/java/ +-d +/tmp/[0-9a-zA-Z/]+ +\%t$') >= 0,
+  Assert match(b:command, '\v^javac +-Xlint +-sourcepath ''/.*java_paths/src/main/java/'' +-d +''/tmp/[0-9a-zA-Z/]+'' +\%t$') >= 0,
   \ 'Invalid command string: ' . b:command
 
 Execute(The javac callback should combine detected source directories and classpaths):
@@ -84,7 +84,7 @@ Execute(The javac callback should combine detected source directories and classp
   \ '/xyz/abc.jar',
   \])
 
-  Assert match(b:command, '\v^javac +-Xlint +-cp +/foo/bar\.jar:/xyz/abc\.jar +-sourcepath /.*java_paths/src/main/java/ +-d +/tmp/[0-9a-zA-Z/]+ +\%t$') >= 0,
+  Assert match(b:command, '\v^javac +-Xlint +-cp +''/foo/bar\.jar:/xyz/abc\.jar'' +-sourcepath ''/.*java_paths/src/main/java/'' +-d +''/tmp/[0-9a-zA-Z/]+'' +\%t$') >= 0,
   \ 'Invalid command string: ' . b:command
 
 Execute(The javac callback should use g:ale_java_javac_options correctly):
@@ -93,5 +93,5 @@ Execute(The javac callback should use g:ale_java_javac_options correctly):
 
   let b:command = ale_linters#java#javac#GetCommand(bufnr(''), [])
 
-  Assert match(b:command, '\v^javac +-Xlint +-d +/tmp/[0-9a-zA-Z/]+ --anything --else +\%t$') >= 0,
+  Assert match(b:command, '\v^javac +-Xlint +-d +''/tmp/[0-9a-zA-Z/]+'' --anything --else +\%t$') >= 0,
   \ 'Invalid command string: ' . b:command
diff --git a/test/command_callback/test_luacheck_command_callback.vader b/test/command_callback/test_luacheck_command_callback.vader
index f283b987..c4ee98a8 100644
--- a/test/command_callback/test_luacheck_command_callback.vader
+++ b/test/command_callback/test_luacheck_command_callback.vader
@@ -7,18 +7,18 @@ After:
   let g:ale_lua_luacheck_executable = 'luacheck'
 
 Execute(The lua luacheck command callback should return the correct default string):
-  AssertEqual 'luacheck --formatter plain --codes --filename %s -',
+  AssertEqual '''luacheck'' --formatter plain --codes --filename %s -',
   \ join(split(ale_linters#lua#luacheck#GetCommand(1)))
 
 Execute(The lua luacheck command callback should let you set options):
   let g:ale_lua_luacheck_options = '--config filename'
 
-  AssertEqual 'luacheck --config filename --formatter plain --codes --filename %s -',
+  AssertEqual '''luacheck'' --config filename --formatter plain --codes --filename %s -',
   \ join(split(ale_linters#lua#luacheck#GetCommand(1)))
 
 Execute(The luacheck executable should be configurable):
   let g:ale_lua_luacheck_executable = 'luacheck.sh'
 
   AssertEqual 'luacheck.sh', ale_linters#lua#luacheck#GetExecutable(1)
-  AssertEqual 'luacheck.sh --formatter plain --codes --filename %s -',
+  AssertEqual '''luacheck.sh'' --formatter plain --codes --filename %s -',
   \ join(split(ale_linters#lua#luacheck#GetCommand(1)))
diff --git a/test/command_callback/test_mypy_command_callback.vader b/test/command_callback/test_mypy_command_callback.vader
index ec82c879..14c9af43 100644
--- a/test/command_callback/test_mypy_command_callback.vader
+++ b/test/command_callback/test_mypy_command_callback.vader
@@ -20,7 +20,7 @@ Execute(The mypy callbacks should return the correct default values):
   \ 'mypy',
   \ ale_linters#python#mypy#GetExecutable(bufnr(''))
   AssertEqual
-  \ 'cd ' . g:dir . ' && mypy --show-column-numbers  %s',
+  \ 'cd ''' . g:dir . ''' && ''mypy'' --show-column-numbers  %s',
   \ ale_linters#python#mypy#GetCommand(bufnr(''))
 
 Execute(The mypy executable should be configurable, and escaped properly):
@@ -30,14 +30,14 @@ Execute(The mypy executable should be configurable, and escaped properly):
   \ 'executable with spaces',
   \ ale_linters#python#mypy#GetExecutable(bufnr(''))
   AssertEqual
-  \ 'cd ' . g:dir . ' && executable\ with\ spaces --show-column-numbers  %s',
+  \ 'cd ''' . g:dir . ''' && ''executable with spaces'' --show-column-numbers  %s',
   \ ale_linters#python#mypy#GetCommand(bufnr(''))
 
 Execute(The mypy command callback should let you set options):
   let g:ale_python_mypy_options = '--some-option'
 
   AssertEqual
-  \ 'cd ' . g:dir . ' && mypy --show-column-numbers --some-option %s',
+  \ 'cd ''' . g:dir . ''' && ''mypy'' --show-column-numbers --some-option %s',
   \ ale_linters#python#mypy#GetCommand(bufnr(''))
 
 Execute(The mypy command should switch directories to the detected project root):
@@ -47,7 +47,7 @@ Execute(The mypy command should switch directories to the detected project root)
   \ 'mypy',
   \ ale_linters#python#mypy#GetExecutable(bufnr(''))
   AssertEqual
-  \ 'cd ' . g:dir . '/python_paths/no_virtualenv/subdir && mypy --show-column-numbers  %s',
+  \ 'cd ''' . g:dir . '/python_paths/no_virtualenv/subdir'' && ''mypy'' --show-column-numbers  %s',
   \ ale_linters#python#mypy#GetCommand(bufnr(''))
 
 Execute(The mypy callbacks should detect virtualenv directories and switch to the project root):
@@ -57,8 +57,8 @@ Execute(The mypy callbacks should detect virtualenv directories and switch to th
   \ g:dir . '/python_paths/with_virtualenv/env/bin/mypy',
   \ ale_linters#python#mypy#GetExecutable(bufnr(''))
   AssertEqual
-  \   'cd ' . g:dir . '/python_paths/with_virtualenv/subdir && '
-  \   . g:dir . '/python_paths/with_virtualenv/env/bin/mypy --show-column-numbers  %s',
+  \   'cd ''' . g:dir . '/python_paths/with_virtualenv/subdir'' && '''
+  \   . g:dir . '/python_paths/with_virtualenv/env/bin/mypy'' --show-column-numbers  %s',
   \ ale_linters#python#mypy#GetCommand(bufnr(''))
 
 Execute(You should able able to use the global mypy instead):
@@ -69,5 +69,5 @@ Execute(You should able able to use the global mypy instead):
   \ 'mypy',
   \ ale_linters#python#mypy#GetExecutable(bufnr(''))
   AssertEqual
-  \ 'cd ' . g:dir . '/python_paths/with_virtualenv/subdir && mypy --show-column-numbers  %s',
+  \ 'cd ''' . g:dir . '/python_paths/with_virtualenv/subdir'' && ''mypy'' --show-column-numbers  %s',
   \ ale_linters#python#mypy#GetCommand(bufnr(''))
diff --git a/test/command_callback/test_pylint_command_callback.vader b/test/command_callback/test_pylint_command_callback.vader
index 533d06a2..040c9ef0 100644
--- a/test/command_callback/test_pylint_command_callback.vader
+++ b/test/command_callback/test_pylint_command_callback.vader
@@ -21,7 +21,7 @@ Execute(The pylint callbacks should return the correct default values):
   \ 'pylint',
   \ ale_linters#python#pylint#GetExecutable(bufnr(''))
   AssertEqual
-  \ 'pylint ' . b:command_tail,
+  \ '''pylint'' ' . b:command_tail,
   \ ale_linters#python#pylint#GetCommand(bufnr(''))
 
 Execute(The pylint executable should be configurable, and escaped properly):
@@ -31,14 +31,14 @@ Execute(The pylint executable should be configurable, and escaped properly):
   \ 'executable with spaces',
   \ ale_linters#python#pylint#GetExecutable(bufnr(''))
   AssertEqual
-  \ 'executable\ with\ spaces ' . b:command_tail,
+  \ '''executable with spaces'' ' . b:command_tail,
   \ ale_linters#python#pylint#GetCommand(bufnr(''))
 
 Execute(The pylint command callback should let you set options):
   let g:ale_python_pylint_options = '--some-option'
 
   AssertEqual
-  \ 'pylint --some-option' . b:command_tail,
+  \ '''pylint'' --some-option' . b:command_tail,
   \ ale_linters#python#pylint#GetCommand(bufnr(''))
 
 Execute(The pylint callbacks shouldn't detect virtualenv directories where they don't exist):
@@ -48,7 +48,7 @@ Execute(The pylint callbacks shouldn't detect virtualenv directories where they
   \ 'pylint',
   \ ale_linters#python#pylint#GetExecutable(bufnr(''))
   AssertEqual
-  \ 'pylint ' . b:command_tail,
+  \ '''pylint'' ' . b:command_tail,
   \ ale_linters#python#pylint#GetCommand(bufnr(''))
 
 Execute(The pylint callbacks should detect virtualenv directories):
@@ -58,7 +58,7 @@ Execute(The pylint callbacks should detect virtualenv directories):
   \ g:dir . '/python_paths/with_virtualenv/env/bin/pylint',
   \ ale_linters#python#pylint#GetExecutable(bufnr(''))
   AssertEqual
-  \ g:dir . '/python_paths/with_virtualenv/env/bin/pylint ' . b:command_tail,
+  \ ''''. g:dir . '/python_paths/with_virtualenv/env/bin/pylint'' ' . b:command_tail,
   \ ale_linters#python#pylint#GetCommand(bufnr(''))
 
 Execute(You should able able to use the global pylint instead):
@@ -69,5 +69,5 @@ Execute(You should able able to use the global pylint instead):
   \ 'pylint',
   \ ale_linters#python#pylint#GetExecutable(bufnr(''))
   AssertEqual
-  \ 'pylint ' . b:command_tail,
+  \ '''pylint'' ' . b:command_tail,
   \ ale_linters#python#pylint#GetCommand(bufnr(''))
diff --git a/test/test_csslint_config_detection.vader b/test/test_csslint_config_detection.vader
index a06258ca..7a783748 100644
--- a/test/test_csslint_config_detection.vader
+++ b/test/test_csslint_config_detection.vader
@@ -16,7 +16,7 @@ Execute(--config should be set when the .csslintrc file is found):
   AssertEqual
   \ (
   \   'csslint --format=compact '
-  \   . '--config=' . fnameescape(g:dir . '/csslint-test-files/some-app/.csslintrc')
+  \   . '--config=' . shellescape(g:dir . '/csslint-test-files/some-app/.csslintrc')
   \   . ' %t'
   \ ),
   \ ale_linters#css#csslint#GetCommand(bufnr(''))
diff --git a/test/test_flow_command.vader b/test/test_flow_command.vader
index 00a2c2a7..f7754f66 100644
--- a/test/test_flow_command.vader
+++ b/test/test_flow_command.vader
@@ -8,7 +8,7 @@ Execute(flow should return a command to run if a .flowconfig file exists):
   silent! cd /testplugin/test
   :e! flow/a/sub/dummy
 
-  AssertEqual 'flow check-contents --respect-pragma --json --from ale %s', ale_linters#javascript#flow#GetCommand(bufnr('%'))
+  AssertEqual '''flow'' check-contents --respect-pragma --json --from ale %s', ale_linters#javascript#flow#GetCommand(bufnr('%'))
 
 Execute(flow should not return a command to run if no .flowconfig file exists):
   silent! cd /testplugin/test
diff --git a/test/test_format_command.vader b/test/test_format_command.vader
index d57729b0..08496c18 100644
--- a/test/test_format_command.vader
+++ b/test/test_format_command.vader
@@ -1,6 +1,6 @@
 Before:
   silent! cd /testplugin/test
-  :e! top/middle/bottom/dummy.txt
+  silent file top/middle/bottom/dummy.txt
 
 After:
   unlet! g:result
@@ -13,29 +13,29 @@ Execute(FormatCommand should handle %%, and ignore other percents):
   AssertEqual ['', '% %%d %%f %x %'], ale#engine#FormatCommand(bufnr('%'), '%% %%%d %%%f %x %')
 
 Execute(FormatCommand should convert %s to the current filename):
-  AssertEqual ['', 'foo ' . fnameescape(expand('%:p')) . ' bar ' . fnameescape(expand('%:p'))], ale#engine#FormatCommand(bufnr('%'), 'foo %s bar %s')
+  AssertEqual ['', 'foo ' . shellescape(expand('%:p')) . ' bar ' . shellescape(expand('%:p'))], ale#engine#FormatCommand(bufnr('%'), 'foo %s bar %s')
 
 Execute(FormatCommand should convert %t to a new temporary filename):
   let g:result = ale#engine#FormatCommand(bufnr('%'), 'foo %t bar %t')
-  let g:match = matchlist(g:result[1], '\v^foo (/tmp/.*/dummy.txt) bar (/tmp/.*/dummy.txt)$')
+  let g:match = matchlist(g:result[1], '\v^foo (''/tmp/[^'']*/dummy.txt'') bar (''/tmp/[^'']*/dummy.txt'')$')
 
   Assert !empty(g:match), 'No match found! Result was: ' . g:result[1]
   " The first item of the result should be a temporary filename, and it should
   " be the same as the escaped name in the command string.
-  AssertEqual g:result[0], fnameescape(g:match[1])
+  AssertEqual shellescape(g:result[0]), g:match[1]
   " The two temporary filenames formatted in should be the same.
   AssertEqual g:match[1], g:match[2]
 
 Execute(FormatCommand should let you combine %s and %t):
   let g:result = ale#engine#FormatCommand(bufnr('%'), 'foo %t bar %s')
-  let g:match = matchlist(g:result[1], '\v^foo (/tmp/.*/dummy.txt) bar (.*/dummy.txt)$')
+  let g:match = matchlist(g:result[1], '\v^foo (''/tmp/.*/dummy.txt'') bar (''.*/dummy.txt'')$')
 
   Assert !empty(g:match), 'No match found! Result was: ' . g:result[1]
   " The first item of the result should be a temporary filename, and it should
   " be the same as the escaped name in the command string.
-  AssertEqual g:result[0], fnameescape(g:match[1])
+  AssertEqual shellescape(g:result[0]), g:match[1]
   " The second item should be equal to the original filename.
-  AssertEqual fnameescape(expand('%:p')), g:match[2]
+  AssertEqual shellescape(expand('%:p')), g:match[2]
 
 Execute(EscapeCommandPart should escape all percent signs):
   AssertEqual '%%s %%t %%%% %%s %%t %%%%', ale#engine#EscapeCommandPart('%s %t %% %s %t %%')
diff --git a/test/util/test_cd_string_commands.vader b/test/util/test_cd_string_commands.vader
index 36212e3b..b0b6c157 100644
--- a/test/util/test_cd_string_commands.vader
+++ b/test/util/test_cd_string_commands.vader
@@ -2,8 +2,7 @@ Before:
   silent! cd /testplugin/test/util
 
 Execute(CdString should output the correct command string):
-  AssertEqual 'cd /foo\ bar/baz && ', ale#path#CdString('/foo bar/baz')
+  AssertEqual 'cd ''/foo bar/baz'' && ', ale#path#CdString('/foo bar/baz')
 
 Execute(BufferCdString should output the correct command string):
-  Assert match(ale#path#BufferCdString(bufnr('')), '^cd .*test/util && $') >= 0,
-  \ 'String didn''t match regex: ' . ale#path#BufferCdString(bufnr(''))
+  AssertEqual 'cd ' . shellescape(getcwd()) . ' && ', ale#path#BufferCdString(bufnr(''))