diff options
| author | Mitermayer Reis <mitermayer.reis@gmail.com> | 2017-11-08 10:19:43 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-08 10:19:43 -0800 |
| commit | b78bb28a7945cb1d3a9d04ce14bd116606f70de5 (patch) | |
| tree | f9b42ff95e1f86ecb196814de603a935d568a912 | |
| parent | 8009900cdff668d0b7f84ebefe2b7f3ab817b779 (diff) | |
| parent | e7c458008bd6c56c881c7ab280395315761c4098 (diff) | |
| download | vim-prettier-b78bb28a7945cb1d3a9d04ce14bd116606f70de5.tar.xz | |
Merge pull request #79 from prettier/reverting-shell-escaping-pr
issues/76 - the shellescapping util function was breaking async
| -rw-r--r-- | autoload/prettier.vim | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/autoload/prettier.vim b/autoload/prettier.vim index d8bbe16..52fae7d 100644 --- a/autoload/prettier.vim +++ b/autoload/prettier.vim @@ -258,7 +258,7 @@ function! s:Get_Prettier_Exec_Args(config) abort \ ' --config-precedence ' . \ get(a:config, 'configPrecedence', g:prettier#config#config_precedence) . \ ' --stdin-filepath ' . - \ prettier#Escape(simplify(expand("%:p"))) . + \ simplify(expand("%:p")) . \ ' --stdin ' return l:cmd endfunction @@ -357,21 +357,3 @@ endfunction function! s:Suggest_Install_Prettier() abort echohl WarningMsg | echom 'Prettier: no prettier executable installation found.' | echohl NONE endfunction - -" Borrowed from https://github.com/w0rp/ale/blob/master/autoload/ale.vim -function! prettier#Escape(str) abort - if fnamemodify(&shell, ':t') is? 'cmd.exe' - " If the string contains spaces, it will be surrounded by quotes. - " Otherwise, special characters will be escaped with carets (^). - return substitute( - \ a:str =~# ' ' - \ ? '"' . substitute(a:str, '"', '""', 'g') . '"' - \ : substitute(a:str, '\v([&|<>^])', '^\1', 'g'), - \ '%', - \ '%%', - \ 'g', - \) - endif - - return shellescape (a:str) -endfunction |